diff --git a/fw-valhalla-service/pom.xml b/fw-valhalla-service/pom.xml
index a7a3c45..2c4f9cb 100644
--- a/fw-valhalla-service/pom.xml
+++ b/fw-valhalla-service/pom.xml
@@ -66,8 +66,8 @@
fw-passport-sdk
- cn.fw.third
- fw-push-sdk
+ cn.fw
+ fw-hermes-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 6d27c88..4e63ecb 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,10 +5,9 @@ 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.third.push.sdk.api.ImSendMessage;
-import cn.fw.third.push.sdk.api.para.im.MsgPara;
+import cn.fw.hermes.sdk.api.ImSendMessage;
+import cn.fw.hermes.sdk.api.para.MsgParamCondition;
import cn.fw.valhalla.common.constant.RoleCode;
-import cn.fw.valhalla.common.enums.AllocationTypeEnum;
import cn.fw.valhalla.common.utils.DateUtil;
import cn.fw.valhalla.domain.db.LeaveNeedDo;
import cn.fw.valhalla.domain.db.customer.Customer;
@@ -358,9 +357,9 @@ public class LeaveNeedDoBizService {
for (UserInfo info : list) {
try {
String text = String.format("%s通过资源分配给你%s台保有客", user.getUserName(), info.getCount());
- final MsgPara msgPara = MsgPara.getOfflineTxetPara(text, null, "保有客分配",
+ final MsgParamCondition msgPara = MsgParamCondition.getOfflineTxetPara(text, null, "保有客分配",
"保有客分配", null, info.getUserId()).build();
- final Message msg = imSendMessage.sendMsg(msgPara);
+ final Message msg = imSendMessage.synSendMsg(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 6cf57dd..fedb3a6 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;
@@ -10,7 +10,6 @@ import cn.fw.valhalla.domain.db.customer.CustomerLoanInfo;
import cn.fw.valhalla.domain.db.pool.StammkundePool;
import cn.fw.valhalla.domain.dto.CustomerDetailDto;
import cn.fw.valhalla.domain.dto.StammkundeDto;
-import cn.fw.valhalla.domain.enums.DefeatReasonEnum;
import cn.fw.valhalla.domain.enums.StammkundeSourcesEnum;
import cn.fw.valhalla.domain.enums.StammkundeStatusEnum;
import cn.fw.valhalla.rpc.angel.InsurerRpcService;
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 78d2d38..189236d 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.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.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.valhalla.common.utils.MobileUtil;
import cn.fw.valhalla.common.utils.StringUtils;
import cn.fw.valhalla.domain.db.customer.Customer;
@@ -247,9 +247,10 @@ public class ContactBizService {
Map ext = new HashMap<>(2);
ext.put("type", MessageBusinessType.SENDER_NOTICE.getMsg());
ext.put("data", data);
- final MsgPara msgPara = MsgPara.getCustomMsg(text, "", ext,
- 0, targetUserId, false).setBusinessType(BusinessType.INTERNAL_NOTIFICATION).build();
- final Message msg = imSendMessage.sendMsg(msgPara);
+ final MsgParamCondition msgPara = MsgParamCondition.getCustomMsg(text, "", ext, 0, targetUserId, false)
+ .setBusinessType(BusinessType.INTERNAL_NOTIFICATION)
+ .build();
+ final Message msg = imSendMessage.synSendMsg(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 534d136..176a315 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,11 +4,12 @@ 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;
@@ -498,9 +499,10 @@ public class CustomerChangeBizService extends AbstractCustomerService {
ext.put("type", MessageBusinessType.CUSTOMER_CHANGE_STATUS.getMsg());
ext.put("done", done);
ext.put("key", key);
- final MsgPara msgPara = MsgPara.getCustomMsg(text, "", ext,
- 0, targetUserId, false).setBusinessType(BusinessType.INTERNAL_NOTIFICATION).build();
- final Message msg = imSendMessage.sendMsg(msgPara);
+ final MsgParamCondition condition = MsgParamCondition.getCustomMsg(text, "", ext, 0, targetUserId, false)
+ .setBusinessType(BusinessType.INTERNAL_NOTIFICATION)
+ .build();
+ final Message msg = imSendMessage.synSendMsg(condition);
log.info("给[{}]推送im消息结果:[{}]", targetUserId, msg.getResult());
} catch (Exception e) {
e.printStackTrace();
diff --git a/pom.xml b/pom.xml
index a5f111b..3a49228 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,6 @@
5.0.0
2.0.0
1.0
- 2.1.6
2.0
2.1.0
2.2.0
@@ -57,6 +56,7 @@
5.2.5
2.1.6
1.0
+ 1.0.0
1.1.3
@@ -134,6 +134,11 @@
cn.fw
+ fw-hermes-sdk
+ ${fw.hermes.sdk}
+
+
+ cn.fw
fw-fastdfs-client
${fw-fastdfs-client.version}
@@ -168,11 +173,6 @@
${fw-pstn-sdk.version}
- cn.fw.third
- fw-push-sdk
- ${fw-push-sdk.version}
-
-
cn.fw
fw-passport-sdk
${fw-passport-sdk.version}