|
|
@@ -27,6 +27,7 @@ import java.util.HashSet;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
+import org.apache.log4j.Logger;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.http.HttpHeaders;
|
|
|
import org.springframework.http.MediaType;
|
|
|
@@ -47,6 +48,8 @@ public class MessageServiceImpl implements MessageService {
|
|
|
|
|
|
private final AppDao appDao;
|
|
|
|
|
|
+ private static final Logger logger = Logger.getLogger(Logger.class);
|
|
|
+
|
|
|
private RestTemplate restTemplate;
|
|
|
|
|
|
private static final String EMAIL_REGEX = "\\w[-\\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\\.)+[A-Za-z]{2,14}";
|
|
|
@@ -323,31 +326,29 @@ public class MessageServiceImpl implements MessageService {
|
|
|
* @param receiver 接收人
|
|
|
*/
|
|
|
private void sendSM(Message message, User receiver) {
|
|
|
- try {
|
|
|
- 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());
|
|
|
- com.uas.ps.message.util.HttpUtil.sendPost(messageUrl, FastjsonUtils.toJson(sms));
|
|
|
- }
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
+ 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();
|
|
|
}
|
|
|
}
|
|
|
- } catch (Exception e) {
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
|