valhalla / fw-valhalla

Commit 6ed0c4366348dc4c9ac76c3b4829a1a7b461a6fa

Authored by 张志伟
2 parents f8056835 8920c2ad

Merge remote-tracking branch 'origin/dev' into test

Inline Side-by-side
Showing 6 changed files with 28 additions and 24 deletions
fw-valhalla-service/pom.xml
  View file @6ed0c43
... ... @@ -66,8 +66,8 @@
66 66 <artifactId>fw-passport-sdk</artifactId>
67 67 </dependency>
68 68 <dependency>
69   - <groupId>cn.fw</groupId>
70   - <artifactId>fw-hermes-sdk</artifactId>
  69 + <groupId>cn.fw.third</groupId>
  70 + <artifactId>fw-push-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
  View file @6ed0c43
... ... @@ -5,8 +5,8 @@ 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.hermes.sdk.api.ImSendMessage;
9   -import cn.fw.hermes.sdk.api.para.MsgParamCondition;
  8 +import cn.fw.third.push.sdk.api.ImSendMessage;
  9 +import cn.fw.third.push.sdk.api.para.im.MsgPara;
10 10 import cn.fw.valhalla.common.constant.RoleCode;
11 11 import cn.fw.valhalla.common.utils.DateUtil;
12 12 import cn.fw.valhalla.domain.db.LeaveNeedDo;
... ... @@ -357,9 +357,9 @@ public class LeaveNeedDoBizService {
357 357 for (UserInfo info : list) {
358 358 try {
359 359 String text = String.format("%s通过资源分配给你%s台保有客", user.getUserName(), info.getCount());
360   - final MsgParamCondition msgPara = MsgParamCondition.getOfflineTxetPara(text, null, "保有客分配",
  360 + final MsgPara msgPara = MsgPara.getOfflineTxetPara(text, null, "保有客分配",
361 361 "保有客分配", null, info.getUserId()).build();
362   - final Message<Boolean> msg = imSendMessage.synSendMsg(msgPara);
  362 + final Message<Integer> msg = imSendMessage.sendMsg(msgPara);
363 363 log.info("给[{}]推送im消息结果:[{}]", info, msg.getResult());
364 364 } catch (Exception e) {
365 365 log.error("给[{}]推送im消息失败：]", info, e);
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AbstractCustomerService.java
  View file @6ed0c43
1 1 package cn.fw.valhalla.service.bus.cust;
2 2  
3   -import cn.fw.hermes.sdk.api.ImSendMessage;
4 3 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;
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/ContactBizService.java
  View file @6ed0c43
... ... @@ -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.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;
  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;
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,10 +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 MsgParamCondition msgPara = MsgParamCondition.getCustomMsg(text, "", ext, 0, targetUserId, false)
  250 + final MsgPara msgPara = MsgPara.getCustomMsg(text, "", ext, 0, targetUserId, false)
251 251 .setBusinessType(BusinessType.INTERNAL_NOTIFICATION)
252 252 .build();
253   - final Message<Boolean> msg = imSendMessage.synSendMsg(msgPara);
  253 + final Message<Integer> msg = imSendMessage.sendMsg(msgPara);
254 254 log.info("给[{}]推送im消息结果:[{}]", targetUserId, msg.getResult());
255 255 } catch (Exception e) {
256 256 e.printStackTrace();
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java
  View file @6ed0c43
... ... @@ -4,12 +4,11 @@ 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;
11 7 import cn.fw.passport.sdk.api.param.WxBCodeParam;
12 8 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;
13 12 import cn.fw.valhalla.common.constant.RoleCode;
14 13 import cn.fw.valhalla.common.utils.DateUtil;
15 14 import cn.fw.valhalla.common.utils.MessageFormatUtil;
... ... @@ -499,10 +498,9 @@ public class CustomerChangeBizService extends AbstractCustomerService {
499 498 ext.put("type", MessageBusinessType.CUSTOMER_CHANGE_STATUS.getMsg());
500 499 ext.put("done", done);
501 500 ext.put("key", key);
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);
  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);
506 504 log.info("给[{}]推送im消息结果:[{}]", targetUserId, msg.getResult());
507 505 } catch (Exception e) {
508 506 e.printStackTrace();
... ...
... ... @@ -57,6 +57,7 @@
57 57 <fw.cas.sdk>2.1.6</fw.cas.sdk>
58 58 <fw-ehr-sdk.version>1.0</fw-ehr-sdk.version>
59 59 <fw.hermes.sdk>1.0.0</fw.hermes.sdk>
  60 + <fw.push.sdk>2.1.7</fw.push.sdk>
60 61 <geodesy>1.1.3</geodesy>
61 62 </properties>
62 63  
... ... @@ -132,10 +133,15 @@
132 133 <artifactId>fw-auth-client</artifactId>
133 134 <version>${fw-auth-client.version}</version>
134 135 </dependency>
  136 +<!-- <dependency>-->
  137 +<!-- <groupId>cn.fw</groupId>-->
  138 +<!-- <artifactId>fw-hermes-sdk</artifactId>-->
  139 +<!-- <version>${fw.hermes.sdk}</version>-->
  140 +<!-- </dependency>-->
135 141 <dependency>
136   - <groupId>cn.fw</groupId>
137   - <artifactId>fw-hermes-sdk</artifactId>
138   - <version>${fw.hermes.sdk}</version>
  142 + <groupId>cn.fw.third</groupId>
  143 + <artifactId>fw-push-sdk</artifactId>
  144 + <version>${fw.push.sdk}</version>
139 145 </dependency>
140 146 <dependency>
141 147 <groupId>cn.fw</groupId>
... ...