From 5c01e131d9ac353e105eedf3d8c9930844f9635e Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Fri, 21 May 2021 09:52:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A1=AE=E8=AE=A4=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lili/common/enums/ResultCode.java |  2 +-
 .../serviceimpl/NoticeMessageServiceImpl.java | 30 +++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
index 8dd3af54..12228041 100644
--- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java
+++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
@@ -84,7 +84,7 @@ public enum ResultCode {
     USER_EDIT_SUCCESS(20001, "用户修改成功"),
     USER_NOT_EXIST(20002, "用户不存在"),
     USER_NOT_LOGIN(20003, "用户未登录"),
-    USER_AUTH_EXPIRED(20004, "认证过期"),
+    USER_AUTH_EXPIRED(20004, "用户已退出，请重新登录"),
     USER_AUTHORITY_ERROR(20005, "权限不足"),
     USER_CONNECT_LOGIN_ERROR(20006, "未找到登录信息"),
     USER_NAME_EXIST(20007, "该用户名已被注册"),
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java
index 6bde7a03..ab29dc40 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java
@@ -51,21 +51,25 @@ public class NoticeMessageServiceImpl extends ServiceImpl<NoticeMessageTemplateM
         if (noticeMessageDTO == null) {
             return;
         }
-        NoticeMessage noticeMessage = this.getOne(new LambdaQueryWrapper<NoticeMessage>().eq(NoticeMessage::getNoticeNode, noticeMessageDTO.getNoticeMessageNodeEnum().getDescription().trim()));
-        //如果通知类站内信开启的情况下
-        if (noticeMessage != null && noticeMessage.getNoticeStatus().equals(SwitchEnum.OPEN.name())) {
-            MemberNotice memberNotice = new MemberNotice();
-            memberNotice.setMemberId(noticeMessageDTO.getMemberId());
-            memberNotice.setTitle(noticeMessage.getNoticeTitle());
-            memberNotice.setContent(noticeMessage.getNoticeContent());
-            //参数不为空，替换内容
-            if (noticeMessageDTO.getParameter() != null) {
-                memberNotice.setContent(replaceNoticeContent(noticeMessage.getNoticeContent(), noticeMessageDTO.getParameter()));
-            } else {
+        try {
+            NoticeMessage noticeMessage = this.getOne(new LambdaQueryWrapper<NoticeMessage>().eq(NoticeMessage::getNoticeNode, noticeMessageDTO.getNoticeMessageNodeEnum().getDescription().trim()));
+            //如果通知类站内信开启的情况下
+            if (noticeMessage != null && noticeMessage.getNoticeStatus().equals(SwitchEnum.OPEN.name())) {
+                MemberNotice memberNotice = new MemberNotice();
+                memberNotice.setMemberId(noticeMessageDTO.getMemberId());
+                memberNotice.setTitle(noticeMessage.getNoticeTitle());
                 memberNotice.setContent(noticeMessage.getNoticeContent());
+                //参数不为空，替换内容
+                if (noticeMessageDTO.getParameter() != null) {
+                    memberNotice.setContent(replaceNoticeContent(noticeMessage.getNoticeContent(), noticeMessageDTO.getParameter()));
+                } else {
+                    memberNotice.setContent(noticeMessage.getNoticeContent());
+                }
+                //添加站内信
+                memberNoticeService.save(memberNotice);
             }
-            //添加站内信
-            memberNoticeService.save(memberNotice);
+        } catch (Exception e) {
+            log.error("站内信发送失败：", e);
         }
 
     }