|
|
@@ -119,7 +119,7 @@ public class MessageServiceImpl implements MessageService {
|
|
|
// 获取改应用应接收的未读、未发送的需要推送的消息
|
|
|
List<Message> messages = messageDao.findByConsumerAppIdAndIsReadAndIsSentNeedToSend(consumerAppExists.getId(),
|
|
|
Constant.NO, Constant.NO);
|
|
|
-
|
|
|
+ logger.info("信息数量:" + messages.size());
|
|
|
Map<String, Object> resultMap = sendMessageByAPI(messages, consumerApp);
|
|
|
resultMap.put("success", "success");
|
|
|
return resultMap;
|
|
|
@@ -269,6 +269,7 @@ public class MessageServiceImpl implements MessageService {
|
|
|
for (Message message : messages) {
|
|
|
try {
|
|
|
User receiver = AccountUtils.getImUserByUserUU(message.getReceiverUu());
|
|
|
+ logger.info("接收人:" + receiver.getName());
|
|
|
// 发送邮件
|
|
|
if (message.getSmsType().contains(SMSType.MAIL)) {
|
|
|
sendMail(message, receiver);
|
|
|
@@ -276,6 +277,7 @@ public class MessageServiceImpl implements MessageService {
|
|
|
|
|
|
// 发送短息
|
|
|
if (message.getSmsType().contains(SMSType.SM)) {
|
|
|
+ logger.info("发短信");
|
|
|
sendSM(message, receiver);
|
|
|
}
|
|
|
|
|
|
@@ -327,27 +329,27 @@ public class MessageServiceImpl implements MessageService {
|
|
|
*/
|
|
|
private void sendSM(Message message, User receiver) {
|
|
|
if (!StringUtils.isEmpty(message.getSmTemplate()) && !StringUtils.isEmpty(receiver.getUid())) {
|
|
|
- if (receiver.getUid() != null) {
|
|
|
- try {
|
|
|
- SmsMessage sms = new SmsMessage();
|
|
|
- List<Object> obj = new ArrayList<Object>();
|
|
|
- obj.add(receiver.getName());
|
|
|
- obj.add(receiver.getName());
|
|
|
-
|
|
|
- User sender = AccountUtils.getImUserByUserUU(message.getSenderUu());
|
|
|
- if (sender != null) {
|
|
|
- obj.add(sender.getName() + "("
|
|
|
- + sender.getName() + ")");
|
|
|
- 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);
|
|
|
- }
|
|
|
- } catch (Exception e) {
|
|
|
- logger.info("发送短信异常:" + e.getMessage());
|
|
|
- e.printStackTrace();
|
|
|
+ logger.info("验证通过");
|
|
|
+ try {
|
|
|
+ SmsMessage sms = new SmsMessage();
|
|
|
+ List<Object> obj = new ArrayList<Object>();
|
|
|
+ obj.add(receiver.getName());
|
|
|
+ obj.add(receiver.getName());
|
|
|
+
|
|
|
+ User sender = AccountUtils.getImUserByUserUU(message.getSenderUu());
|
|
|
+ logger.info("发送人:" + sender.getName());
|
|
|
+ if (sender != null) {
|
|
|
+ obj.add(sender.getName() + "("
|
|
|
+ + sender.getName() + ")");
|
|
|
+ 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);
|
|
|
}
|
|
|
+ } catch (Exception e) {
|
|
|
+ logger.info("发送短信异常:" + e.getMessage());
|
|
|
+ e.printStackTrace();
|
|
|
}
|
|
|
}
|
|
|
}
|