Commit f7072b5bbe654c6ee43d7ebb016777ac8cee7c81
Merge remote-tracking branch 'origin/dev' into test
Showing
6 changed files
with
29 additions
and
28 deletions
fw-valhalla-service/pom.xml
... | ... | @@ -66,8 +66,8 @@ |
66 | 66 | <artifactId>fw-passport-sdk</artifactId> |
67 | 67 | </dependency> |
68 | 68 | <dependency> |
69 | - <groupId>cn.fw.third</groupId> | |
70 | - <artifactId>fw-push-sdk</artifactId> | |
69 | + <groupId>cn.fw</groupId> | |
70 | + <artifactId>fw-hermes-sdk</artifactId> | |
71 | 71 | </dependency> |
72 | 72 | <dependency> |
73 | 73 | <groupId>cn.fw</groupId> | ... | ... |
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; |
5 | 5 | import cn.fw.common.page.AppPage; |
6 | 6 | import cn.fw.common.web.auth.LoginAuthBean; |
7 | 7 | import cn.fw.data.base.domain.common.Message; |
8 | -import cn.fw.third.push.sdk.api.ImSendMessage; | |
9 | -import cn.fw.third.push.sdk.api.para.im.MsgPara; | |
8 | +import cn.fw.hermes.sdk.api.ImSendMessage; | |
9 | +import cn.fw.hermes.sdk.api.para.MsgParamCondition; | |
10 | 10 | import cn.fw.valhalla.common.constant.RoleCode; |
11 | -import cn.fw.valhalla.common.enums.AllocationTypeEnum; | |
12 | 11 | import cn.fw.valhalla.common.utils.DateUtil; |
13 | 12 | import cn.fw.valhalla.domain.db.LeaveNeedDo; |
14 | 13 | import cn.fw.valhalla.domain.db.customer.Customer; |
... | ... | @@ -358,9 +357,9 @@ public class LeaveNeedDoBizService { |
358 | 357 | for (UserInfo info : list) { |
359 | 358 | try { |
360 | 359 | String text = String.format("%s通过资源分配给你%s台保有客", user.getUserName(), info.getCount()); |
361 | - final MsgPara msgPara = MsgPara.getOfflineTxetPara(text, null, "保有客分配", | |
360 | + final MsgParamCondition msgPara = MsgParamCondition.getOfflineTxetPara(text, null, "保有客分配", | |
362 | 361 | "保有客分配", null, info.getUserId()).build(); |
363 | - final Message<Integer> msg = imSendMessage.sendMsg(msgPara); | |
362 | + final Message<Boolean> msg = imSendMessage.synSendMsg(msgPara); | |
364 | 363 | log.info("给[{}]推送im消息结果:[{}]", info, msg.getResult()); |
365 | 364 | } catch (Exception e) { |
366 | 365 | log.error("给[{}]推送im消息失败:]", info, e); | ... | ... |
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AbstractCustomerService.java
1 | 1 | package cn.fw.valhalla.service.bus.cust; |
2 | 2 | |
3 | +import cn.fw.hermes.sdk.api.ImSendMessage; | |
3 | 4 | import cn.fw.oop.sdk.enums.BizTypeEnum; |
4 | -import cn.fw.third.push.sdk.api.ImSendMessage; | |
5 | 5 | import cn.fw.valhalla.common.utils.DateUtil; |
6 | 6 | import cn.fw.valhalla.component.CustomerChangeProducer; |
7 | 7 | import cn.fw.valhalla.domain.db.customer.Customer; |
... | ... | @@ -10,7 +10,6 @@ import cn.fw.valhalla.domain.db.customer.CustomerLoanInfo; |
10 | 10 | import cn.fw.valhalla.domain.db.pool.StammkundePool; |
11 | 11 | import cn.fw.valhalla.domain.dto.CustomerDetailDto; |
12 | 12 | import cn.fw.valhalla.domain.dto.StammkundeDto; |
13 | -import cn.fw.valhalla.domain.enums.DefeatReasonEnum; | |
14 | 13 | import cn.fw.valhalla.domain.enums.StammkundeSourcesEnum; |
15 | 14 | import cn.fw.valhalla.domain.enums.StammkundeStatusEnum; |
16 | 15 | import cn.fw.valhalla.rpc.angel.InsurerRpcService; | ... | ... |
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; |
3 | 3 | import cn.fw.common.exception.BusinessException; |
4 | 4 | import cn.fw.common.web.auth.PassportAuthBean; |
5 | 5 | import cn.fw.data.base.domain.common.Message; |
6 | -import cn.fw.third.push.sdk.api.ImSendMessage; | |
7 | -import cn.fw.third.push.sdk.api.para.im.BusinessType; | |
8 | -import cn.fw.third.push.sdk.api.para.im.MessageBusinessType; | |
9 | -import cn.fw.third.push.sdk.api.para.im.MsgPara; | |
6 | +import cn.fw.hermes.sdk.api.ImSendMessage; | |
7 | +import cn.fw.hermes.sdk.api.para.BusinessType; | |
8 | +import cn.fw.hermes.sdk.api.para.MessageBusinessType; | |
9 | +import cn.fw.hermes.sdk.api.para.MsgParamCondition; | |
10 | 10 | import cn.fw.valhalla.common.utils.MobileUtil; |
11 | 11 | import cn.fw.valhalla.common.utils.StringUtils; |
12 | 12 | import cn.fw.valhalla.domain.db.customer.Customer; |
... | ... | @@ -247,9 +247,10 @@ public class ContactBizService { |
247 | 247 | Map<String, Object> ext = new HashMap<>(2); |
248 | 248 | ext.put("type", MessageBusinessType.SENDER_NOTICE.getMsg()); |
249 | 249 | ext.put("data", data); |
250 | - final MsgPara msgPara = MsgPara.getCustomMsg(text, "", ext, | |
251 | - 0, targetUserId, false).setBusinessType(BusinessType.INTERNAL_NOTIFICATION).build(); | |
252 | - final Message<Integer> msg = imSendMessage.sendMsg(msgPara); | |
250 | + final MsgParamCondition msgPara = MsgParamCondition.getCustomMsg(text, "", ext, 0, targetUserId, false) | |
251 | + .setBusinessType(BusinessType.INTERNAL_NOTIFICATION) | |
252 | + .build(); | |
253 | + final Message<Boolean> msg = imSendMessage.synSendMsg(msgPara); | |
253 | 254 | log.info("给[{}]推送im消息结果:[{}]", targetUserId, msg.getResult()); |
254 | 255 | } catch (Exception e) { |
255 | 256 | e.printStackTrace(); | ... | ... |
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java
... | ... | @@ -4,11 +4,12 @@ import cn.fw.common.exception.BusinessException; |
4 | 4 | import cn.fw.common.web.auth.LoginAuthBean; |
5 | 5 | import cn.fw.common.web.auth.PassportAuthBean; |
6 | 6 | import cn.fw.data.base.domain.common.Message; |
7 | +import cn.fw.hermes.sdk.api.para.BusinessType; | |
8 | +import cn.fw.hermes.sdk.api.para.MessageBusinessType; | |
9 | +import cn.fw.hermes.sdk.api.para.MsgPara; | |
10 | +import cn.fw.hermes.sdk.api.para.MsgParamCondition; | |
7 | 11 | import cn.fw.passport.sdk.api.param.WxBCodeParam; |
8 | 12 | import cn.fw.starter.redis.redis.RedisUtil; |
9 | -import cn.fw.third.push.sdk.api.para.im.BusinessType; | |
10 | -import cn.fw.third.push.sdk.api.para.im.MessageBusinessType; | |
11 | -import cn.fw.third.push.sdk.api.para.im.MsgPara; | |
12 | 13 | import cn.fw.valhalla.common.constant.RoleCode; |
13 | 14 | import cn.fw.valhalla.common.utils.DateUtil; |
14 | 15 | import cn.fw.valhalla.common.utils.MessageFormatUtil; |
... | ... | @@ -498,9 +499,10 @@ public class CustomerChangeBizService extends AbstractCustomerService { |
498 | 499 | ext.put("type", MessageBusinessType.CUSTOMER_CHANGE_STATUS.getMsg()); |
499 | 500 | ext.put("done", done); |
500 | 501 | ext.put("key", key); |
501 | - final MsgPara msgPara = MsgPara.getCustomMsg(text, "", ext, | |
502 | - 0, targetUserId, false).setBusinessType(BusinessType.INTERNAL_NOTIFICATION).build(); | |
503 | - final Message<Integer> msg = imSendMessage.sendMsg(msgPara); | |
502 | + final MsgParamCondition condition = MsgParamCondition.getCustomMsg(text, "", ext, 0, targetUserId, false) | |
503 | + .setBusinessType(BusinessType.INTERNAL_NOTIFICATION) | |
504 | + .build(); | |
505 | + final Message<Boolean> msg = imSendMessage.synSendMsg(condition); | |
504 | 506 | log.info("给[{}]推送im消息结果:[{}]", targetUserId, msg.getResult()); |
505 | 507 | } catch (Exception e) { |
506 | 508 | e.printStackTrace(); | ... | ... |
pom.xml
... | ... | @@ -42,7 +42,6 @@ |
42 | 42 | <fw-erp-sdk.version>5.0.0</fw-erp-sdk.version> |
43 | 43 | <fw-pstn-sdk.version>2.0.0</fw-pstn-sdk.version> |
44 | 44 | <fw-card-sdk.version>1.0</fw-card-sdk.version> |
45 | - <fw-push-sdk.version>2.1.6</fw-push-sdk.version> | |
46 | 45 | <fw-fastdfs-client.version>2.0</fw-fastdfs-client.version> |
47 | 46 | <rocketmq-spring-boot-starter.version>2.1.0</rocketmq-spring-boot-starter.version> |
48 | 47 | <fw-passport-sdk.version>2.2.0</fw-passport-sdk.version> |
... | ... | @@ -57,6 +56,7 @@ |
57 | 56 | <hutool.all>5.2.5</hutool.all> |
58 | 57 | <fw.cas.sdk>2.1.6</fw.cas.sdk> |
59 | 58 | <fw-ehr-sdk.version>1.0</fw-ehr-sdk.version> |
59 | + <fw.hermes.sdk>1.0.0</fw.hermes.sdk> | |
60 | 60 | <geodesy>1.1.3</geodesy> |
61 | 61 | </properties> |
62 | 62 | |
... | ... | @@ -134,6 +134,11 @@ |
134 | 134 | </dependency> |
135 | 135 | <dependency> |
136 | 136 | <groupId>cn.fw</groupId> |
137 | + <artifactId>fw-hermes-sdk</artifactId> | |
138 | + <version>${fw.hermes.sdk}</version> | |
139 | + </dependency> | |
140 | + <dependency> | |
141 | + <groupId>cn.fw</groupId> | |
137 | 142 | <artifactId>fw-fastdfs-client</artifactId> |
138 | 143 | <version>${fw-fastdfs-client.version}</version> |
139 | 144 | </dependency> |
... | ... | @@ -168,11 +173,6 @@ |
168 | 173 | <version>${fw-pstn-sdk.version}</version> |
169 | 174 | </dependency> |
170 | 175 | <dependency> |
171 | - <groupId>cn.fw.third</groupId> | |
172 | - <artifactId>fw-push-sdk</artifactId> | |
173 | - <version>${fw-push-sdk.version}</version> | |
174 | - </dependency> | |
175 | - <dependency> | |
176 | 176 | <groupId>cn.fw</groupId> |
177 | 177 | <artifactId>fw-passport-sdk</artifactId> |
178 | 178 | <version>${fw-passport-sdk.version}</version> | ... | ... |