注释邮件发送、IM发送接口，调整短信模板参数设置

src/main/java/com/uas/ps/message/service/impl/MessageServiceImpl.java

@@ -60,7 +60,6 @@ public class MessageServiceImpl implements MessageService {
     /**
      * 邮件服务主机地址
      */
-//    @Value("#{sys.messageServiceIp ?: 'http://message.ubtob.com/'}")
     private static final String MAIL_CONSOLE_HOST = "http://10.10.100.136:8080";
 
     /**
@@ -271,9 +270,9 @@ public class MessageServiceImpl implements MessageService {
                     User receiver = AccountUtils.getImUserByUserUU(message.getReceiverUu());
                     logger.info("接收人：" + receiver.getName());
                     // 发送邮件
-                    if (message.getSmsType().contains(SMSType.MAIL)) {
-                        sendMail(message, receiver);
-                    }
+//                    if (message.getSmsType().contains(SMSType.MAIL)) {
+//                        sendMail(message, receiver);
+//                    }
 
                     // 发送短息
                     if (message.getSmsType().contains(SMSType.SM)) {
@@ -282,10 +281,9 @@ public class MessageServiceImpl implements MessageService {
                     }
 
                     // 发送IM
-                    if (message.getSmsType().contains(SMSType.IM)) {
-                        sendIM(message, receiver, consumerApp);
-                    }
-                    message.setIsSent(Constant.YES);
+//                    if (message.getSmsType().contains(SMSType.IM)) {
+//                        sendIM(message, receiver, consumerApp);
+//                    }
                 } catch (Exception e) {
                     System.err.println(e.getMessage());
                 }
@@ -334,18 +332,18 @@ public class MessageServiceImpl implements MessageService {
                 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() + ")");
+                    obj.add(sender.getName());
+                    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);
                 }
             } catch (Exception e) {
                 logger.info("发送短信异常：" + e.getMessage());