fix: halo-dev#748 (halo-dev#749)

ruibaby · Apr 5, 2020 · 73bea7a · 73bea7a
1 parent 9c07138
commit 73bea7a
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/main/java/run/halo/app/listener/comment/CommentEventListener.java b/src/main/java/run/halo/app/listener/comment/CommentEventListener.java
@@ -80,11 +80,12 @@ public void handleCommentNewEvent(CommentNewEvent newEvent) {
 
         User user = userService.getCurrentUser().orElseThrow(() -> new ServiceException("未查询到博主信息"));
 
-
         Map<String, Object> data = new HashMap<>();
 
         StringBuilder subject = new StringBuilder();
 
+        Boolean enabledAbsolutePath = optionService.isEnabledAbsolutePath();
+
         if (newEvent.getSource() instanceof PostCommentService) {
             // Get postComment id
             PostComment postComment = postCommentService.getById(newEvent.getCommentId());
@@ -93,7 +94,7 @@ public void handleCommentNewEvent(CommentNewEvent newEvent) {
 
             BasePostMinimalDTO post = postService.convertToMinimal(postService.getById(postComment.getPostId()));
 
-            data.put("pageFullPath", post.getFullPath());
+            data.put("pageFullPath", enabledAbsolutePath ? post.getFullPath() : optionService.getBlogBaseUrl() + post.getFullPath());
             data.put("pageTitle", post.getTitle());
             data.put("author", postComment.getAuthor());
             data.put("content", postComment.getContent());
@@ -109,7 +110,7 @@ public void handleCommentNewEvent(CommentNewEvent newEvent) {
 
             BasePostMinimalDTO sheet = sheetService.convertToMinimal(sheetService.getById(sheetComment.getPostId()));
 
-            data.put("pageFullPath", sheet.getFullPath());
+            data.put("pageFullPath", enabledAbsolutePath ? sheet.getFullPath() : optionService.getBlogBaseUrl() + sheet.getFullPath());
             data.put("pageTitle", sheet.getTitle());
             data.put("author", sheetComment.getAuthor());
             data.put("content", sheetComment.getContent());
@@ -167,6 +168,8 @@ public void handleCommentReplyEvent(CommentReplyEvent replyEvent) {
 
         StringBuilder subject = new StringBuilder();
 
+        Boolean enabledAbsolutePath = optionService.isEnabledAbsolutePath();
+
         log.debug("replyEvent.getSource():" + replyEvent.getSource().toString());
 
         if (replyEvent.getSource() instanceof PostCommentService) {
@@ -187,7 +190,7 @@ public void handleCommentReplyEvent(CommentReplyEvent replyEvent) {
 
             BasePostMinimalDTO post = postService.convertToMinimal(postService.getById(postComment.getPostId()));
 
-            data.put("pageFullPath", post.getFullPath());
+            data.put("pageFullPath", enabledAbsolutePath ? post.getFullPath() : optionService.getBlogBaseUrl() + post.getFullPath());
             data.put("pageTitle", post.getTitle());
             data.put("baseAuthor", baseComment.getAuthor());
             data.put("baseContent", baseComment.getContent());
@@ -217,7 +220,7 @@ public void handleCommentReplyEvent(CommentReplyEvent replyEvent) {
 
             BasePostMinimalDTO sheet = sheetService.convertToMinimal(sheetService.getById(sheetComment.getPostId()));
 
-            data.put("pageFullPath", sheet.getFullPath());
+            data.put("pageFullPath", enabledAbsolutePath ? sheet.getFullPath() : optionService.getBlogBaseUrl() + sheet.getFullPath());
             data.put("pageTitle", sheet.getTitle());
             data.put("baseAuthor", baseComment.getAuthor());
             data.put("baseContent", baseComment.getContent());