Merge branch 'master' into dev

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

@@ -61,7 +61,7 @@ public class MessageServiceImpl implements MessageService {
      * 邮件服务主机地址
      */
 //    @Value("#{sys.messageServiceIp ?: 'http://message.ubtob.com/'}")
-    private static final String MAIL_CONSOLE_HOST = "http://message.ubtob.com/";
+    private static final String MAIL_CONSOLE_HOST = "http://10.10.100.136:8080";
 
     /**
      * 发送邮件给单个人url
@@ -75,7 +75,7 @@ public class MessageServiceImpl implements MessageService {
     /**
      * 短信接口
      */
-    private final String messageUrl = "http://message.ubtob.com/sms/send";
+    private final String messageUrl = "http://10.10.100.136:8080/sms/send";
 
     @Autowired
     public MessageServiceImpl(MessageDao messageDao, AppDao appDao) {