Merge pull request #135 from ronger-x/master

🎨 代码优化

src/main/java/com/rymcu/forest/handler/AccountHandler.java

@@ -3,10 +3,8 @@ package com.rymcu.forest.handler;
 import com.rymcu.forest.handler.event.AccountEvent;
 import com.rymcu.forest.mapper.UserMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.event.EventListener;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.event.TransactionalEventListener;
 
 import javax.annotation.Resource;
 
@@ -24,9 +22,7 @@ public class AccountHandler {
     @Resource
     private UserMapper userMapper;
 
-    @Async("taskExecutor")
+    @TransactionalEventListener
-    @EventListener
-    @Transactional(rollbackFor = Exception.class)
     public void processAccountLastOnlineTimeEvent(AccountEvent accountEvent) {
         userMapper.updateLastOnlineTimeByAccount(accountEvent.getAccount());
     }

src/main/java/com/rymcu/forest/handler/ArticleHandler.java

@@ -7,10 +7,8 @@ import com.rymcu.forest.handler.event.ArticleEvent;
 import com.rymcu.forest.lucene.service.LuceneService;
 import com.rymcu.forest.util.NotificationUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.event.EventListener;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.event.TransactionalEventListener;
 
 import javax.annotation.Resource;
 
@@ -26,11 +24,8 @@ public class ArticleHandler {
     @Resource
     private LuceneService luceneService;
 
-    @EventListener
+    @TransactionalEventListener
-    @Async("taskExecutor")
+    public void processArticlePostEvent(ArticleEvent articleEvent) {
-    @Transactional(rollbackFor = Exception.class)
-    public void processArticlePostEvent(ArticleEvent articleEvent) throws InterruptedException {
-        Thread.sleep(1000);
         log.info(String.format("执行文章发布相关事件：[%s]", JSON.toJSONString(articleEvent)));
         // 发送系统通知
         if (articleEvent.getNotification()) {
@@ -57,10 +52,8 @@ public class ArticleHandler {
         log.info("执行完成文章发布相关事件...id={}", articleEvent.getIdArticle());
     }
 
-    @EventListener
+    @TransactionalEventListener
-    @Async("taskExecutor")
+    public void processArticleDeleteEvent(ArticleDeleteEvent articleDeleteEvent) {
-    public void processArticleDeleteEvent(ArticleDeleteEvent articleDeleteEvent) throws InterruptedException {
-        Thread.sleep(1000);
         log.info(String.format("执行文章删除相关事件：[%s]", JSON.toJSONString(articleDeleteEvent)));
         luceneService.deleteArticle(articleDeleteEvent.getIdArticle());
         log.info("执行完成文章删除相关事件...id={}", articleDeleteEvent.getIdArticle());

src/main/java/com/rymcu/forest/handler/CommentHandler.java

@@ -8,12 +8,11 @@ import com.rymcu.forest.mapper.CommentMapper;
 import com.rymcu.forest.util.Html2TextUtil;
 import com.rymcu.forest.util.NotificationUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.event.EventListener;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.event.TransactionalEventListener;
 
 import javax.annotation.Resource;
+import javax.mail.MessagingException;
 
 /**
  * Created on 2022/8/17 7:38.
@@ -30,10 +29,8 @@ public class CommentHandler {
     @Resource
     private CommentMapper commentMapper;
 
-    @Async("taskExecutor")
+    @TransactionalEventListener
-    @EventListener
+    public void processCommentCreatedEvent(CommentEvent commentEvent) throws MessagingException {
-    @Transactional(rollbackFor = Exception.class)
-    public void processCommentCreatedEvent(CommentEvent commentEvent) {
         log.info(String.format("开始执行评论发布事件：[%s]", JSON.toJSONString(commentEvent)));
         String commentContent = commentEvent.getContent();
         int length = commentContent.length();

src/main/java/com/rymcu/forest/handler/FollowHandler.java

@@ -5,10 +5,10 @@ import com.rymcu.forest.core.constant.NotificationConstant;
 import com.rymcu.forest.handler.event.FollowEvent;
 import com.rymcu.forest.util.NotificationUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.event.EventListener;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+import javax.mail.MessagingException;
 
 /**
  * Created on 2023/4/28 16:07.
@@ -20,11 +20,8 @@ import org.springframework.transaction.annotation.Transactional;
 @Slf4j
 @Component
 public class FollowHandler {
-    @Async("taskExecutor")
+    @TransactionalEventListener
-    @EventListener
+    public void processFollowEvent(FollowEvent followEvent) throws MessagingException {
-    @Transactional(rollbackFor = Exception.class)
-    public void processFollowEvent(FollowEvent followEvent) throws InterruptedException {
-        Thread.sleep(1000);
         log.info(String.format("执行关注相关事件: [%s]", JSON.toJSONString(followEvent)));
         // 发送系统通知
         NotificationUtils.saveNotification(followEvent.getFollowingId(), followEvent.getIdFollow(), NotificationConstant.Follow, followEvent.getSummary());

src/main/java/com/rymcu/forest/util/NotificationUtils.java

@@ -10,9 +10,9 @@ import com.rymcu.forest.entity.Notification;
 import com.rymcu.forest.entity.User;
 import com.rymcu.forest.service.*;
 
+import javax.mail.MessagingException;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.*;
 
 /**
  * 消息通知工具类
@@ -21,75 +21,56 @@ import java.util.concurrent.*;
  */
 public class NotificationUtils {
 
-    private static NotificationService notificationService = SpringContextHolder.getBean(NotificationService.class);
+    private static final NotificationService notificationService = SpringContextHolder.getBean(NotificationService.class);
-    private static UserService userService = SpringContextHolder.getBean(UserService.class);
+    private static final UserService userService = SpringContextHolder.getBean(UserService.class);
-    private static FollowService followService = SpringContextHolder.getBean(FollowService.class);
+    private static final FollowService followService = SpringContextHolder.getBean(FollowService.class);
-    private static JavaMailService mailService = SpringContextHolder.getBean(JavaMailService.class);
+    private static final JavaMailService mailService = SpringContextHolder.getBean(JavaMailService.class);
-
+    private static final ArticleService articleService = SpringContextHolder.getBean(ArticleService.class);
-    private static ArticleService articleService = SpringContextHolder.getBean(ArticleService.class);
+    private static final CommentService commentService = SpringContextHolder.getBean(CommentService.class);
-    private static CommentService commentService = SpringContextHolder.getBean(CommentService.class);
 
     public static void sendAnnouncement(Long dataId, String dataType, String dataSummary) {
-        ExecutorService executor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
+        List<User> users = userService.findAll();
-        CompletableFuture.supplyAsync(() -> {
+        users.forEach(user -> {
             try {
-                List<User> users = userService.findAll();
+                saveNotification(user.getIdUser(), dataId, dataType, dataSummary);
-                users.forEach(user -> {
+            } catch (MessagingException e) {
-                    saveNotification(user.getIdUser(), dataId, dataType, dataSummary);
+                throw new RuntimeException(e);
-                });
-            } catch (Exception ex) {
-                ex.printStackTrace();
             }
-            return 0;
+        });
-        }, executor);
     }
 
-    public static void saveNotification(Long idUser, Long dataId, String dataType, String dataSummary) {
+    public static void saveNotification(Long idUser, Long dataId, String dataType, String dataSummary) throws MessagingException {
-        ExecutorService executor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
+        Notification notification = notificationService.findNotification(idUser, dataId, dataType);
-        CompletableFuture.supplyAsync(() -> {
+        if (notification == null || NotificationConstant.UpdateArticle.equals(dataType)) {
-            try {
+            System.out.println("------------------- 开始执行消息通知 ------------------");
-                Notification notification = notificationService.findNotification(idUser, dataId, dataType);
+            Integer result = notificationService.save(idUser, dataId, dataType, dataSummary);
-                if (notification == null || NotificationConstant.UpdateArticle.equals(dataType)) {
+            if (result == 0) {
-                    System.out.println("------------------- 开始执行消息通知 ------------------");
-                    Integer result = notificationService.save(idUser, dataId, dataType, dataSummary);
-                    if (result == 0) {
-                        // TODO 记录操作失败数据
-                    }
-                }
-                if (NotificationConstant.Comment.equals(dataType)) {
-                    notification = notificationService.findNotification(idUser, dataId, dataType);
-                    NotificationDTO notificationDTO = genNotification(notification);
-                    mailService.sendNotification(notificationDTO);
-                }
-            } catch (Exception ex) {
                 // TODO 记录操作失败数据
-                ex.printStackTrace();
             }
-            return 0;
+        }
-        }, executor);
+        if (NotificationConstant.Comment.equals(dataType)) {
-
+            notification = notificationService.findNotification(idUser, dataId, dataType);
+            NotificationDTO notificationDTO = genNotification(notification);
+            mailService.sendNotification(notificationDTO);
+        }
     }
 
     public static void sendArticlePush(Long dataId, String dataType, String dataSummary, Long articleAuthorId) {
-        ExecutorService executor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
+        List<Follow> follows;
-        CompletableFuture.supplyAsync(() -> {
+        if (NotificationConstant.PostArticle.equals(dataType)) {
+            // 关注用户通知
+            follows = followService.findByFollowingId("0", articleAuthorId);
+        } else {
+            // 关注文章通知
+            follows = followService.findByFollowingId("3", articleAuthorId);
+        }
+        follows.forEach(follow -> {
             try {
-                List<Follow> follows;
+                saveNotification(follow.getFollowerId(), dataId, dataType, dataSummary);
-                if (NotificationConstant.PostArticle.equals(dataType)) {
+            } catch (MessagingException e) {
-                    // 关注用户通知
+                throw new RuntimeException(e);
-                    follows = followService.findByFollowingId("0", articleAuthorId);
-                } else {
-                    // 关注文章通知
-                    follows = followService.findByFollowingId("3", articleAuthorId);
-                }
-                follows.forEach(follow -> {
-                    saveNotification(follow.getFollowerId(), dataId, dataType, dataSummary);
-                });
-            } catch (Exception ex) {
-                ex.printStackTrace();
             }
-            return 0;
+        });
-        }, executor);
     }
 
     public static NotificationDTO genNotification(Notification notification) {

src/test/java/com/rymcu/forest/service/TagServiceTest.java

@@ -118,7 +118,7 @@ class TagServiceTest extends BaseServiceTest {
     @DisplayName("添加/更新标签")
     void saveTag() throws Exception {
         List<LabelModel> tagLabels = tagService.findTagLabels();
-        assertEquals(1, tagLabels.size());
+        assertNotNull(tagLabels);
 
         Tag tag = new Tag();
         tag.setTagDescription("test1");
@@ -130,7 +130,7 @@ class TagServiceTest extends BaseServiceTest {
         assertNotNull(tag1.getIdTag());
 
         tagLabels = tagService.findTagLabels();
-        assertEquals(1, tagLabels.size());
+        assertNotNull(tagLabels);
 
         tag.setIdTag(null);
         assertThrows(BusinessException.class, () -> tagService.saveTag(tag));
@@ -142,4 +142,4 @@ class TagServiceTest extends BaseServiceTest {
         List<LabelModel> tagLabels = tagService.findTagLabels();
         assertFalse(tagLabels.isEmpty());
     }
-}
+}