|
|
@@ -342,22 +342,26 @@ public class MessageServiceImpl implements MessageService {
|
|
|
try {
|
|
|
UserView receiver = AccountUtils.getImUserByUserUU(message.getReceiverUu(),
|
|
|
message.getReceiverEnuu());
|
|
|
- logger.info("接收人:" + receiver.getName());
|
|
|
- // 发送邮件
|
|
|
+ if (receiver.getName() != null) {
|
|
|
+ logger.info("接收人:" + receiver.getName());
|
|
|
+ // 发送邮件
|
|
|
// if (message.getSmsType().contains(SMSType.MAIL)) {
|
|
|
// sendMail(message, receiver);
|
|
|
// }
|
|
|
|
|
|
- // 发送短息
|
|
|
- if (message.getSmsType().contains(SMSType.SM)) {
|
|
|
- logger.info("发短信");
|
|
|
- sendSM(message, receiver);
|
|
|
- }
|
|
|
+ // 发送短息
|
|
|
+ if (message.getSmsType().contains(SMSType.SM)) {
|
|
|
+ logger.info("发短信");
|
|
|
+ sendSM(message, receiver);
|
|
|
+ }
|
|
|
|
|
|
- // 发送IM
|
|
|
+ // 发送IM
|
|
|
// if (message.getSmsType().contains(SMSType.IM)) {
|
|
|
// sendIM(message, receiver, consumerApp);
|
|
|
// }
|
|
|
+ } else {
|
|
|
+ logger.info("接收人姓名为空,uu:" + message.getReceiverUu() + ",enuu:" + message.getReceiverEnuu());
|
|
|
+ }
|
|
|
} catch (Exception e) {
|
|
|
logger.info(e.getMessage());
|
|
|
}
|
|
|
@@ -409,16 +413,20 @@ public class MessageServiceImpl implements MessageService {
|
|
|
obj.add(receiver.getName());
|
|
|
|
|
|
UserView sender = AccountUtils.getImUserByUserUU(message.getSenderUu(), message.getSenderEnuu());
|
|
|
- logger.info("发送人:" + sender.getName());
|
|
|
- if (sender != null) {
|
|
|
- obj.add(sender.getSpaceName());
|
|
|
- obj.add(message.getRemark());
|
|
|
- sms.setParams(obj);
|
|
|
- sms.setReceiver(receiver.getUid());
|
|
|
- sms.setTemplateId(message.getSmTemplate());
|
|
|
- String response = com.uas.ps.message.util.HttpUtil.sendPost(messageUrl, FastjsonUtils.toJson(sms));
|
|
|
- logger.info("发送短信:" + response);
|
|
|
- message.setIsSent(Constant.YES);
|
|
|
+
|
|
|
+ if (sender != null && sender.getName() != null && sender.getSpaceName() != null) {
|
|
|
+ logger.info("发送人:" + sender.getName());
|
|
|
+ obj.add(sender.getSpaceName());
|
|
|
+ obj.add(message.getRemark());
|
|
|
+ sms.setParams(obj);
|
|
|
+ sms.setReceiver(receiver.getUid());
|
|
|
+ sms.setTemplateId(message.getSmTemplate());
|
|
|
+ String response = com.uas.ps.message.util.HttpUtil
|
|
|
+ .sendPost(messageUrl, FastjsonUtils.toJson(sms));
|
|
|
+ logger.info("发送短信:" + response);
|
|
|
+ message.setIsSent(Constant.YES);
|
|
|
+ } else {
|
|
|
+ logger.info("发送人信息为空,uu:" + message.getSenderUu() + ",enuu:" + message.getSenderEnuu());
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
logger.info("发送短信异常:" + e.getMessage());
|