提交代码

src/main/java/com/zq/email/service/impl/EmailAttachServiceImpl.java

@@ -115,7 +115,7 @@ public class EmailAttachServiceImpl extends ServiceImpl<EmailAttachMapper, Email
             if (profile.equals("product") || profile.equals("test")) {
                 download = "http://147.1.3.87/attwjsf_email" + path;
             }else if (profile.equals("wanpro") || profile.equals("wantest")){
-                download = "http://172.28.1.159:83/attwjsf_yj" + path;
+                download = "http://172.28.1.159:82/attwjsf_yj" + path;
             }
         }else{
             if (profile.equals("wanpro") || profile.equals("wantest")) {
@@ -136,7 +136,7 @@ public class EmailAttachServiceImpl extends ServiceImpl<EmailAttachMapper, Email
             if (profile.equals("product") || profile.equals("test")) {
                 download = "http://147.1.3.87/attwjsf_email" + path;
             }else if (profile.equals("wanpro") || profile.equals("wantest")){
-                download = "http://172.28.1.159:83/attwjsf_yj" + path;
+                download = "http://172.28.1.159:82/attwjsf_yj" + path;
             }
         }else{
             if (profile.equals("wanpro") || profile.equals("wantest")) {

src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java

@@ -158,7 +158,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
                     this.saveEmailReceiver(receiverList, content, EmailFolderEnum.FOLDER_INBOX.getKey().longValue(), WhetherEnum.YES.getKey(), vo.getIsSend());
                     //发送短信
                     if (vo.getIsSend().equals(WhetherEnum.YES.getKey()) && content.getSmsRemind().equals(WhetherEnum.YES.getKey())) {
-                        smsUtil.sendBatchSms(receiverList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId());
+                        smsUtil.sendBatchSms(receiverList, "您有一份来自"+content.getSendUserName()+"的邮件: "+content.getTitle()+"。", content.getId());
                     }
                     //代办
                     if (vo.getIsSend().equals(WhetherEnum.YES.getKey()) && (content.getMessageRemind() != null && content.getMessageRemind().equals(WhetherEnum.YES.getKey()))) {
@@ -181,7 +181,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
                     this.saveEmailReceiver(deptUserList, content, EmailFolderEnum.FOLDER_DEPT_INBOX.getKey().longValue(), WhetherEnum.NO.getKey(), vo.getIsSend());
                     //短信
                     if (vo.getIsSend().equals(WhetherEnum.YES.getKey()) &&  content.getSmsRemind().equals(WhetherEnum.YES.getKey())){
-                        smsUtil.sendBatchSms(deptUserList, "您有一封新的邮件，标题为《" + content.getTitle() + "》。请及时查收。", content.getId());
+                        smsUtil.sendBatchSms(deptUserList, "您有一份来自"+content.getSendUserName()+"的邮件: "+content.getTitle()+"。", content.getId());
                     }
                     //代办
                     if (vo.getIsSend().equals(WhetherEnum.YES.getKey()) &&  content.getMessageRemind().equals(WhetherEnum.YES.getKey())) {

src/main/java/com/zq/email/utils/MsgUtil.java

@@ -43,7 +43,7 @@ public class MsgUtil {
         params .put("sender", sender);
         params .put("nickName", sender);
         params .put("title","您有一封新邮件提醒");
-        params .put("content", "您有一封新的邮件，标题为《"+content.getTitle()+"》。请及时查收。");
+        params .put("content", "请查收我的邮件!主题:"+content.getTitle()+"。");
         params.put("userIdList", userVoList.stream().map(e->e.getUserId()).collect(Collectors.toList()));
         params .put("businessId", content.getId());
         params.put("jumpUrl", systemInfo.getHomeUrl() + "/#/detail?folderId="+folderId+"&contentId=" + content.getId());