{{ rule }}
+
+
+
-
-
+
+
diff --git a/frontend_nuxt/pages/message.vue b/frontend_nuxt/pages/message.vue
index 3a8098f3b..7d0a54723 100644
--- a/frontend_nuxt/pages/message.vue
+++ b/frontend_nuxt/pages/message.vue
@@ -33,15 +33,13 @@
topComments = commentService
+ .getCommentsForPost(p.getId(), CommentSort.MOST_INTERACTIONS);
+ topComments = topComments.subList(0, Math.min(10, topComments.size()));
+ StringBuilder commentMd = new StringBuilder();
+ for (Comment c : topComments) {
+ commentMd.append("> @")
+ .append(nullSafe(c.getAuthor().getUsername()))
+ .append(": ")
+ .append(nullSafe(c.getContent()).replace("\r", ""))
+ .append("\n\n");
+ }
+
sb.append("- ");
elem(sb, "title", cdata(nullSafe(p.getTitle())));
elem(sb, "link", link);
@@ -117,6 +134,11 @@ public class RssController {
sb.append("
");
}
From 92e630df229a0f5d343f48b6df222ed469a70c52 Mon Sep 17 00:00:00 2001
From: Tim
Date: Thu, 21 Aug 2025 15:26:53 +0800
Subject: [PATCH 21/62] feat: comment
---
.../openisle/controller/RssController.java | 84 +++++++++++++++----
1 file changed, 66 insertions(+), 18 deletions(-)
diff --git a/backend/src/main/java/com/openisle/controller/RssController.java b/backend/src/main/java/com/openisle/controller/RssController.java
index 8fe6a3fa4..7dc6122f7 100644
--- a/backend/src/main/java/com/openisle/controller/RssController.java
+++ b/backend/src/main/java/com/openisle/controller/RssController.java
@@ -107,18 +107,11 @@ public class RssController {
enclosure = absolutifyUrl(enclosure, base);
}
- // Top comments in Markdown
+ // 6) 构造优雅的附加区块（原文链接 + 精选评论），编入
List topComments = commentService
.getCommentsForPost(p.getId(), CommentSort.MOST_INTERACTIONS);
topComments = topComments.subList(0, Math.min(10, topComments.size()));
- StringBuilder commentMd = new StringBuilder();
- for (Comment c : topComments) {
- commentMd.append("> @")
- .append(nullSafe(c.getAuthor().getUsername()))
- .append(": ")
- .append(nullSafe(c.getContent()).replace("\r", ""))
- .append("\n\n");
- }
+ String footerHtml = buildFooterHtml(base, link, topComments);
sb.append("- ");
elem(sb, "title", cdata(nullSafe(p.getTitle())));
@@ -127,18 +120,16 @@ public class RssController {
elem(sb, "pubDate", toRfc1123Gmt(p.getCreatedAt().atZone(ZoneId.systemDefault())));
// 摘要
elem(sb, "description", cdata(plain));
- // 全文（HTML）
- sb.append("
");
}
@@ -158,8 +149,12 @@ public class RssController {
private static String sanitizeHtml(String html) {
if (html == null) return "";
Safelist wl = Safelist.relaxed()
- .addTags("pre", "code", "figure", "figcaption", "picture", "source",
- "table","thead","tbody","tr","th","td","h1","h2","h3","h4","h5","h6")
+ .addTags(
+ "pre","code","figure","figcaption","picture","source",
+ "table","thead","tbody","tr","th","td",
+ "h1","h2","h3","h4","h5","h6",
+ "hr","blockquote"
+ )
.addAttributes("a", "href", "title", "target", "rel")
.addAttributes("img", "src", "alt", "title", "width", "height")
.addAttributes("source", "srcset", "type", "media")
@@ -268,6 +263,59 @@ public class RssController {
return "image/jpeg";
}
+ /* ===================== 附加区块（原文链接 + 精选评论） ===================== */
+
+ /**
+ * 将“原文链接 + 精选评论（最多 10 条）”以优雅的 Markdown 形式渲染为 HTML，
+ * 并做 sanitize + 绝对化，然后拼入 content:encoded 尾部。
+ */
+ private static String buildFooterHtml(String baseUrl, String originalLink, List topComments) {
+ StringBuilder md = new StringBuilder(256);
+
+ // 分割线
+ md.append("\n\n---\n\n");
+
+ // 原文链接（强调 + 可点击）
+ md.append("**原文链接：** ")
+ .append("[").append(originalLink).append("](").append(originalLink).append(")")
+ .append("\n\n");
+
+ // 精选评论（仅当有评论时展示）
+ if (topComments != null && !topComments.isEmpty()) {
+ md.append("### 精选评论（Top ").append(Math.min(10, topComments.size())).append("）\n\n");
+ for (Comment c : topComments) {
+ String author = usernameOf(c);
+ String content = nullSafe(c.getContent()).replace("\r", "");
+ // 使用引用样式展示，提升可读性
+ md.append("> @").append(author).append(": ").append(content).append("\n\n");
+ }
+ }
+
+ // 渲染为 HTML，并保持和正文一致的处理流程
+ String html = renderMarkdown(md.toString());
+ String safe = sanitizeHtml(html);
+ return absolutifyHtml(safe, baseUrl);
+ }
+
+ private static String usernameOf(Comment c) {
+ if (c == null) return "匿名";
+ try {
+ Object authorObj = c.getAuthor();
+ if (authorObj == null) return "匿名";
+ // 反射避免直接依赖实体字段名变化（也可直接强转到具体类型）
+ String username;
+ try {
+ username = (String) authorObj.getClass().getMethod("getUsername").invoke(authorObj);
+ } catch (Exception e) {
+ username = null;
+ }
+ if (username == null || username.isEmpty()) return "匿名";
+ return username;
+ } catch (Exception ignored) {
+ return "匿名";
+ }
+ }
+
/* ===================== 时间/字符串/XML ===================== */
private static String toRfc1123Gmt(ZonedDateTime zdt) {
From 41a5eda311d64d8838d8c8d5f9287eb76c87ccff Mon Sep 17 00:00:00 2001
From: Tim <135014430+nagisa77@users.noreply.github.com>
Date: Thu, 21 Aug 2025 16:10:53 +0800
Subject: [PATCH 22/62] feat: support featured medals
---
.../openisle/controller/PostController.java | 23 +++++++++++++++
.../com/openisle/dto/FeaturedMedalDto.java | 12 ++++++++
.../java/com/openisle/model/MedalType.java | 1 +
.../com/openisle/model/NotificationType.java | 2 ++
.../com/openisle/model/PointHistoryType.java | 1 +
.../openisle/repository/PostRepository.java | 2 ++
.../com/openisle/service/MedalService.java | 20 +++++++++++++
.../com/openisle/service/PointService.java | 6 ++++
.../com/openisle/service/PostService.java | 28 ++++++++++++++++++-
.../openisle/service/MedalServiceTest.java | 2 +-
frontend_nuxt/components/AchievementList.vue | 3 ++
frontend_nuxt/pages/index.vue | 8 ++++--
frontend_nuxt/pages/message.vue | 15 ++++++++++
frontend_nuxt/pages/points.vue | 9 ++++++
frontend_nuxt/utils/medal.js | 1 +
frontend_nuxt/utils/notification.js | 12 ++++++++
16 files changed, 141 insertions(+), 4 deletions(-)
create mode 100644 backend/src/main/java/com/openisle/dto/FeaturedMedalDto.java
diff --git a/backend/src/main/java/com/openisle/controller/PostController.java b/backend/src/main/java/com/openisle/controller/PostController.java
index 86d8fd9d1..3ea7334e2 100644
--- a/backend/src/main/java/com/openisle/controller/PostController.java
+++ b/backend/src/main/java/com/openisle/controller/PostController.java
@@ -171,4 +171,27 @@ public class PostController {
return postService.listPostsByLatestReply(ids, tids, page, pageSize)
.stream().map(postMapper::toSummaryDto).collect(Collectors.toList());
}
+
+ @GetMapping("/featured")
+ public List featuredPosts(@RequestParam(value = "categoryId", required = false) Long categoryId,
+ @RequestParam(value = "categoryIds", required = false) List categoryIds,
+ @RequestParam(value = "tagId", required = false) Long tagId,
+ @RequestParam(value = "tagIds", required = false) List tagIds,
+ @RequestParam(value = "page", required = false) Integer page,
+ @RequestParam(value = "pageSize", required = false) Integer pageSize,
+ Authentication auth) {
+ List ids = categoryIds;
+ if (categoryId != null) {
+ ids = java.util.List.of(categoryId);
+ }
+ List tids = tagIds;
+ if (tagId != null) {
+ tids = java.util.List.of(tagId);
+ }
+ if (auth != null) {
+ userVisitService.recordVisit(auth.getName());
+ }
+ return postService.listFeaturedPosts(ids, tids, page, pageSize)
+ .stream().map(postMapper::toSummaryDto).collect(Collectors.toList());
+ }
}
diff --git a/backend/src/main/java/com/openisle/dto/FeaturedMedalDto.java b/backend/src/main/java/com/openisle/dto/FeaturedMedalDto.java
new file mode 100644
index 000000000..2e5cbaf9e
--- /dev/null
+++ b/backend/src/main/java/com/openisle/dto/FeaturedMedalDto.java
@@ -0,0 +1,12 @@
+package com.openisle.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class FeaturedMedalDto extends MedalDto {
+ private long currentFeaturedCount;
+ private long targetFeaturedCount;
+}
+
diff --git a/backend/src/main/java/com/openisle/model/MedalType.java b/backend/src/main/java/com/openisle/model/MedalType.java
index 00553511d..c6509cebb 100644
--- a/backend/src/main/java/com/openisle/model/MedalType.java
+++ b/backend/src/main/java/com/openisle/model/MedalType.java
@@ -3,6 +3,7 @@ package com.openisle.model;
public enum MedalType {
COMMENT,
POST,
+ FEATURED,
CONTRIBUTOR,
SEED,
PIONEER
diff --git a/backend/src/main/java/com/openisle/model/NotificationType.java b/backend/src/main/java/com/openisle/model/NotificationType.java
index d8e3a99a1..c4b4e0e25 100644
--- a/backend/src/main/java/com/openisle/model/NotificationType.java
+++ b/backend/src/main/java/com/openisle/model/NotificationType.java
@@ -40,6 +40,8 @@ public enum NotificationType {
LOTTERY_WIN,
/** Your lottery post was drawn */
LOTTERY_DRAW,
+ /** Your post was featured */
+ POST_FEATURED,
/** You were mentioned in a post or comment */
MENTION
}
diff --git a/backend/src/main/java/com/openisle/model/PointHistoryType.java b/backend/src/main/java/com/openisle/model/PointHistoryType.java
index 7e71b1bef..af03d989c 100644
--- a/backend/src/main/java/com/openisle/model/PointHistoryType.java
+++ b/backend/src/main/java/com/openisle/model/PointHistoryType.java
@@ -6,6 +6,7 @@ public enum PointHistoryType {
POST_LIKED,
COMMENT_LIKED,
INVITE,
+ FEATURE,
SYSTEM_ONLINE,
REDEEM
}
diff --git a/backend/src/main/java/com/openisle/repository/PostRepository.java b/backend/src/main/java/com/openisle/repository/PostRepository.java
index 58083b193..a072c83f1 100644
--- a/backend/src/main/java/com/openisle/repository/PostRepository.java
+++ b/backend/src/main/java/com/openisle/repository/PostRepository.java
@@ -97,6 +97,8 @@ public interface PostRepository extends JpaRepository {
long countDistinctByTags_Id(Long tagId);
+ long countByAuthor_IdAndRssExcludedFalse(Long userId);
+
@Query("SELECT t.id, COUNT(DISTINCT p) FROM Post p JOIN p.tags t WHERE t.id IN :tagIds GROUP BY t.id")
List countPostsByTagIds(@Param("tagIds") List tagIds);
diff --git a/backend/src/main/java/com/openisle/service/MedalService.java b/backend/src/main/java/com/openisle/service/MedalService.java
index daa4acc31..1f43caccd 100644
--- a/backend/src/main/java/com/openisle/service/MedalService.java
+++ b/backend/src/main/java/com/openisle/service/MedalService.java
@@ -6,6 +6,7 @@ import com.openisle.dto.MedalDto;
import com.openisle.dto.PostMedalDto;
import com.openisle.dto.SeedUserMedalDto;
import com.openisle.dto.PioneerMedalDto;
+import com.openisle.dto.FeaturedMedalDto;
import com.openisle.model.MedalType;
import com.openisle.model.User;
import com.openisle.repository.CommentRepository;
@@ -74,6 +75,23 @@ public class MedalService {
postMedal.setSelected(selected == MedalType.POST);
medals.add(postMedal);
+ FeaturedMedalDto featuredMedal = new FeaturedMedalDto();
+ featuredMedal.setIcon("https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/icons/achi_rss.png");
+ featuredMedal.setTitle("精选作者");
+ featuredMedal.setDescription("至少有1篇文章被收录为精选");
+ featuredMedal.setType(MedalType.FEATURED);
+ featuredMedal.setTargetFeaturedCount(1);
+ if (user != null) {
+ long count = postRepository.countByAuthor_IdAndRssExcludedFalse(user.getId());
+ featuredMedal.setCurrentFeaturedCount(count);
+ featuredMedal.setCompleted(count >= 1);
+ } else {
+ featuredMedal.setCurrentFeaturedCount(0);
+ featuredMedal.setCompleted(false);
+ }
+ featuredMedal.setSelected(selected == MedalType.FEATURED);
+ medals.add(featuredMedal);
+
ContributorMedalDto contributorMedal = new ContributorMedalDto();
contributorMedal.setIcon("https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/icons/achi_coder.png");
contributorMedal.setTitle("贡献者");
@@ -141,6 +159,8 @@ public class MedalService {
user.setDisplayMedal(MedalType.COMMENT);
} else if (postRepository.countByAuthor_Id(user.getId()) >= POST_TARGET) {
user.setDisplayMedal(MedalType.POST);
+ } else if (postRepository.countByAuthor_IdAndRssExcludedFalse(user.getId()) >= 1) {
+ user.setDisplayMedal(MedalType.FEATURED);
} else if (contributorService.getContributionLines(user.getUsername()) >= CONTRIBUTION_TARGET) {
user.setDisplayMedal(MedalType.CONTRIBUTOR);
} else if (userRepository.countByCreatedAtBefore(user.getCreatedAt()) < PIONEER_LIMIT) {
diff --git a/backend/src/main/java/com/openisle/service/PointService.java b/backend/src/main/java/com/openisle/service/PointService.java
index 69a543389..2b5a53060 100644
--- a/backend/src/main/java/com/openisle/service/PointService.java
+++ b/backend/src/main/java/com/openisle/service/PointService.java
@@ -33,6 +33,12 @@ public class PointService {
return addPoint(user, 500, PointHistoryType.INVITE, null, null, invitee);
}
+ public int awardForFeatured(String userName, Long postId) {
+ User user = userRepository.findByUsername(userName).orElseThrow();
+ Post post = postRepository.findById(postId).orElseThrow();
+ return addPoint(user, 500, PointHistoryType.FEATURE, post, null, null);
+ }
+
private PointLog getTodayLog(User user) {
LocalDate today = LocalDate.now();
return pointLogRepository.findByUserAndLogDate(user, today)
diff --git a/backend/src/main/java/com/openisle/service/PostService.java b/backend/src/main/java/com/openisle/service/PostService.java
index f0238d29e..d62a7fa40 100644
--- a/backend/src/main/java/com/openisle/service/PostService.java
+++ b/backend/src/main/java/com/openisle/service/PostService.java
@@ -67,6 +67,7 @@ public class PostService {
private final TaskScheduler taskScheduler;
private final EmailSender emailSender;
private final ApplicationContext applicationContext;
+ private final PointService pointService;
private final ConcurrentMap> scheduledFinalizations = new ConcurrentHashMap<>();
@Value("${app.website-url:https://www.open-isle.com}")
private String websiteUrl;
@@ -89,6 +90,7 @@ public class PostService {
TaskScheduler taskScheduler,
EmailSender emailSender,
ApplicationContext applicationContext,
+ PointService pointService,
@Value("${app.post.publish-mode:DIRECT}") PublishMode publishMode) {
this.postRepository = postRepository;
this.userRepository = userRepository;
@@ -107,6 +109,7 @@ public class PostService {
this.taskScheduler = taskScheduler;
this.emailSender = emailSender;
this.applicationContext = applicationContext;
+ this.pointService = pointService;
this.publishMode = publishMode;
}
@@ -146,7 +149,10 @@ public class PostService {
public Post includeInRss(Long id) {
Post post = postRepository.findById(id).orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
post.setRssExcluded(false);
- return postRepository.save(post);
+ post = postRepository.save(post);
+ notificationService.createNotification(post.getAuthor(), NotificationType.POST_FEATURED, post, null, null, null, null, null);
+ pointService.awardForFeatured(post.getAuthor().getUsername(), post.getId());
+ return post;
}
public Post createPost(String username,
@@ -458,6 +464,26 @@ public class PostService {
return paginate(sortByPinnedAndCreated(posts), page, pageSize);
}
+ public List listFeaturedPosts(java.util.List categoryIds,
+ java.util.List tagIds,
+ Integer page,
+ Integer pageSize) {
+ List posts;
+ boolean hasCategories = categoryIds != null && !categoryIds.isEmpty();
+ boolean hasTags = tagIds != null && !tagIds.isEmpty();
+ if (hasCategories && hasTags) {
+ posts = listPostsByCategoriesAndTags(categoryIds, tagIds, null, null);
+ } else if (hasCategories) {
+ posts = listPostsByCategories(categoryIds, null, null);
+ } else if (hasTags) {
+ posts = listPostsByTags(tagIds, null, null);
+ } else {
+ posts = listPosts();
+ }
+ posts = posts.stream().filter(p -> !Boolean.TRUE.equals(p.getRssExcluded())).toList();
+ return paginate(sortByPinnedAndCreated(posts), page, pageSize);
+ }
+
public List listPendingPosts() {
return postRepository.findByStatus(PostStatus.PENDING);
}
diff --git a/backend/src/test/java/com/openisle/service/MedalServiceTest.java b/backend/src/test/java/com/openisle/service/MedalServiceTest.java
index a4a10a56d..a873ea9c6 100644
--- a/backend/src/test/java/com/openisle/service/MedalServiceTest.java
+++ b/backend/src/test/java/com/openisle/service/MedalServiceTest.java
@@ -27,7 +27,7 @@ class MedalServiceTest {
List medals = service.getMedals(null);
medals.forEach(m -> assertFalse(m.isCompleted()));
- assertEquals(5, medals.size());
+ assertEquals(6, medals.size());
}
@Test
diff --git a/frontend_nuxt/components/AchievementList.vue b/frontend_nuxt/components/AchievementList.vue
index a58e4b4a2..ddcceef94 100644
--- a/frontend_nuxt/components/AchievementList.vue
+++ b/frontend_nuxt/components/AchievementList.vue
@@ -26,6 +26,9 @@
{{ medal.currentPostCount }}/{{ medal.targetPostCount }}
+
+ {{ medal.currentFeaturedCount }}/{{ medal.targetFeaturedCount }}
+
{{ medal.currentContributionLines }}/{{ medal.targetContributionLines }}
diff --git a/frontend_nuxt/pages/index.vue b/frontend_nuxt/pages/index.vue
index fd0434dc4..d99bff85a 100644
--- a/frontend_nuxt/pages/index.vue
+++ b/frontend_nuxt/pages/index.vue
@@ -26,7 +26,10 @@
Date: Fri, 22 Aug 2025 12:21:10 +0800
Subject: [PATCH 33/62] =?UTF-8?q?fix:=20=E6=B6=88=E6=81=AF=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2ui=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend_nuxt/components/HeaderComponent.vue | 12 +-
frontend_nuxt/pages/message-box/[id].vue | 480 +++++++++++++++++
.../pages/{messages => message-box}/index.vue | 204 ++++----
frontend_nuxt/pages/messages/[id].vue | 490 ------------------
frontend_nuxt/pages/users/[id].vue | 26 +-
5 files changed, 588 insertions(+), 624 deletions(-)
create mode 100644 frontend_nuxt/pages/message-box/[id].vue
rename frontend_nuxt/pages/{messages => message-box}/index.vue (66%)
delete mode 100644 frontend_nuxt/pages/messages/[id].vue
diff --git a/frontend_nuxt/components/HeaderComponent.vue b/frontend_nuxt/components/HeaderComponent.vue
index 2e7e9e46f..5ec4446fb 100644
--- a/frontend_nuxt/components/HeaderComponent.vue
+++ b/frontend_nuxt/components/HeaderComponent.vue
@@ -50,7 +50,9 @@
@@ -193,14 +195,14 @@ const refrechData = async () => {
}
const goToMessages = () => {
- navigateTo('/messages');
-};
+ navigateTo('/message-box')
+}
const headerMenuItems = computed(() => [
{ text: '设置', onClick: goToSettings },
{ text: '个人主页', onClick: goToProfile },
{ text: '退出', onClick: goToLogout },
-]);
+])
/** 其余逻辑保持不变 */
const iconClass = computed(() => {
@@ -226,7 +228,7 @@ onMounted(async () => {
const updateUnread = async () => {
if (authState.loggedIn) {
// Initialize the unread count composable
- fetchUnreadCount();
+ fetchUnreadCount()
}
}
diff --git a/frontend_nuxt/pages/message-box/[id].vue b/frontend_nuxt/pages/message-box/[id].vue
new file mode 100644
index 000000000..023eaea85
--- /dev/null
+++ b/frontend_nuxt/pages/message-box/[id].vue
@@ -0,0 +1,480 @@
+
+
\ No newline at end of file
+
diff --git a/frontend_nuxt/pages/messages/[id].vue b/frontend_nuxt/pages/messages/[id].vue
deleted file mode 100644
index f9ef6d074..000000000
--- a/frontend_nuxt/pages/messages/[id].vue
+++ /dev/null
@@ -1,490 +0,0 @@
-
-
-
+
+ 积分兑换
+
+
+ 积分历史
-
-
-
-
-
-
+
+ - 我的积分：{{ - point - }} -
-🎉 积分规则
+
+
+ {{ rule }}
+
- ![good.name]()
-
+
+
{{ good.name }}
-
-
- {{ good.cost }} 积分
-
-
+
+
-
-
+
+
+ + 我的积分：{{ + point + }} +
+
+ ![good.name]()
+
+ {{ good.name }}
+
+
+ {{ good.cost }} 积分
+
+
+
+
+
+
+
+
+
+
+
+ 发送帖子
+ {{
+ item.postTitle
+ }}
+ ，获得{{ item.amount }}积分
+
+
+ 发送评论
+ {{ stripMarkdownLength(item.commentContent, 100) }}
+ ，获得{{ item.amount }}积分
+
+
+ 帖子
+ {{
+ item.postTitle
+ }}
+ 被
+ {{
+ item.fromUserName
+ }}
+ 按赞，获得{{ item.amount }}积分
+
+
+ 评论
+ {{ stripMarkdownLength(item.commentContent, 100) }}
+ 被
+ {{
+ item.fromUserName
+ }}
+ 按赞，获得{{ item.amount }}积分
+
+
+ 邀请了好友
+ {{
+ item.fromUserName
+ }} ，加入社区，获得 {{ item.amount }} 积分
+
+
+ 积分历史系统上线，你目前的积分是 {{ item.balance }}
+
+
+
+
@@ -76,6 +73,7 @@ import { ref, onMounted, watch } from 'vue'
import AvatarCropper from '~/components/AvatarCropper.vue'
import BaseInput from '~/components/BaseInput.vue'
import Dropdown from '~/components/Dropdown.vue'
+import BaseSwitch from '~/components/BaseSwitch.vue'
import { toast } from '~/main'
import { fetchCurrentUser, getToken, setToken } from '~/utils/auth'
import { frostedState, setFrosted } from '~/utils/frosted'
@@ -318,51 +316,6 @@ const save = async () => {
max-width: 200px;
}
-.switch {
- position: relative;
- display: inline-block;
- width: 40px;
- height: 20px;
-}
-
-.switch input {
- opacity: 0;
- width: 0;
- height: 0;
-}
-
-.slider {
- position: absolute;
- cursor: pointer;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- background-color: #ccc;
- transition: 0.2s;
- border-radius: 20px;
-}
-
-.slider:before {
- position: absolute;
- content: '';
- height: 16px;
- width: 16px;
- left: 2px;
- bottom: 2px;
- background-color: white;
- transition: 0.2s;
- border-radius: 50%;
-}
-
-input:checked + .slider {
- background-color: var(--primary-color);
-}
-
-input:checked + .slider:before {
- transform: translateX(20px);
-}
-
.profile-section {
margin-bottom: 30px;
}
From 0a722c81c5ee84a1a0e8921132dc366f8fb7e65e Mon Sep 17 00:00:00 2001
From: tim
Date: Thu, 21 Aug 2025 13:37:02 +0800
Subject: [PATCH 18/62] =?UTF-8?q?fix:=20=E5=BE=AE=E4=BF=A1=E9=BB=91?=
=?UTF-8?q?=E5=90=8D=E5=8D=95=E7=94=B3=E8=AF=89=20#676?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend_nuxt/public/tencent2707107139169774686.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 frontend_nuxt/public/tencent2707107139169774686.txt
diff --git a/frontend_nuxt/public/tencent2707107139169774686.txt b/frontend_nuxt/public/tencent2707107139169774686.txt
new file mode 100644
index 000000000..71aded954
--- /dev/null
+++ b/frontend_nuxt/public/tencent2707107139169774686.txt
@@ -0,0 +1 @@
+1839503219847005265
\ No newline at end of file
From c08ecb5e3343770b98d50eb00dd92cb11d84dd88 Mon Sep 17 00:00:00 2001
From: Tim <135014430+nagisa77@users.noreply.github.com>
Date: Thu, 21 Aug 2025 13:38:53 +0800
Subject: [PATCH 19/62] Record point redemption in history
---
.../java/com/openisle/model/PointHistoryType.java | 3 ++-
.../java/com/openisle/service/PointMallService.java | 11 +++++++++++
frontend_nuxt/pages/points.vue | 4 ++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/backend/src/main/java/com/openisle/model/PointHistoryType.java b/backend/src/main/java/com/openisle/model/PointHistoryType.java
index ceda76185..7e71b1bef 100644
--- a/backend/src/main/java/com/openisle/model/PointHistoryType.java
+++ b/backend/src/main/java/com/openisle/model/PointHistoryType.java
@@ -6,5 +6,6 @@ public enum PointHistoryType {
POST_LIKED,
COMMENT_LIKED,
INVITE,
- SYSTEM_ONLINE
+ SYSTEM_ONLINE,
+ REDEEM
}
diff --git a/backend/src/main/java/com/openisle/service/PointMallService.java b/backend/src/main/java/com/openisle/service/PointMallService.java
index c930ca7f6..0f3965b52 100644
--- a/backend/src/main/java/com/openisle/service/PointMallService.java
+++ b/backend/src/main/java/com/openisle/service/PointMallService.java
@@ -3,8 +3,11 @@ package com.openisle.service;
import com.openisle.exception.FieldException;
import com.openisle.exception.NotFoundException;
import com.openisle.model.PointGood;
+import com.openisle.model.PointHistory;
+import com.openisle.model.PointHistoryType;
import com.openisle.model.User;
import com.openisle.repository.PointGoodRepository;
+import com.openisle.repository.PointHistoryRepository;
import com.openisle.repository.UserRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -18,6 +21,7 @@ public class PointMallService {
private final PointGoodRepository pointGoodRepository;
private final UserRepository userRepository;
private final NotificationService notificationService;
+ private final PointHistoryRepository pointHistoryRepository;
public List listGoods() {
return pointGoodRepository.findAll();
@@ -32,6 +36,13 @@ public class PointMallService {
user.setPoint(user.getPoint() - good.getCost());
userRepository.save(user);
notificationService.createPointRedeemNotifications(user, good.getName() + ": " + contact);
+ PointHistory history = new PointHistory();
+ history.setUser(user);
+ history.setType(PointHistoryType.REDEEM);
+ history.setAmount(-good.getCost());
+ history.setBalance(user.getPoint());
+ history.setCreatedAt(java.time.LocalDateTime.now());
+ pointHistoryRepository.save(history);
return user.getPoint();
}
}
diff --git a/frontend_nuxt/pages/points.vue b/frontend_nuxt/pages/points.vue
index 663928c66..bc1a60294 100644
--- a/frontend_nuxt/pages/points.vue
+++ b/frontend_nuxt/pages/points.vue
@@ -136,6 +136,9 @@
}}
加入社区 🎉，获得 {{ item.amount }} 积分
+
+ 兑换商品，消耗 {{ -item.amount }} 积分
+
积分历史系统上线
你目前的积分是 {{ item.balance }}
@@ -188,6 +191,7 @@ const iconMap = {
COMMENT_LIKED: 'fas fa-thumbs-up',
INVITE: 'fas fa-user-plus',
SYSTEM_ONLINE: 'fas fa-clock',
+ REDEEM: 'fas fa-gift',
}
onMounted(async () => {
From 5f5b6f84a8613263cdf3d4d9ff1e228c5c1a8813 Mon Sep 17 00:00:00 2001
From: Tim <135014430+nagisa77@users.noreply.github.com>
Date: Thu, 21 Aug 2025 14:28:33 +0800
Subject: [PATCH 20/62] feat: add markdown comments and link to rss
---
.../openisle/controller/RssController.java | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/backend/src/main/java/com/openisle/controller/RssController.java b/backend/src/main/java/com/openisle/controller/RssController.java
index 4970ebcc1..8fe6a3fa4 100644
--- a/backend/src/main/java/com/openisle/controller/RssController.java
+++ b/backend/src/main/java/com/openisle/controller/RssController.java
@@ -1,7 +1,10 @@
package com.openisle.controller;
import com.openisle.model.Post;
+import com.openisle.model.Comment;
+import com.openisle.model.CommentSort;
import com.openisle.service.PostService;
+import com.openisle.service.CommentService;
import lombok.RequiredArgsConstructor;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
@@ -31,6 +34,7 @@ import java.util.regex.Pattern;
@RequiredArgsConstructor
public class RssController {
private final PostService postService;
+ private final CommentService commentService;
@Value("${app.website-url:https://www.open-isle.com}")
private String websiteUrl;
@@ -103,6 +107,19 @@ public class RssController {
enclosure = absolutifyUrl(enclosure, base);
}
+ // Top comments in Markdown
+ List
@@ -152,7 +155,7 @@ const route = useRoute()
const tagOptions = ref([])
const categoryOptions = ref([])
-const topics = ref(['最新回复', '最新', '排行榜' /*, '热门', '类别'*/])
+const topics = ref(['精选', '最新回复', '最新', '排行榜' /*, '热门', '类别'*/])
const selectedTopicCookie = useCookie('homeTab')
const selectedTopic = ref(
selectedTopicCookie.value
@@ -236,6 +239,7 @@ const baseQuery = computed(() => ({
const listApiPath = computed(() => {
if (selectedTopic.value === '排行榜') return '/api/posts/ranking'
if (selectedTopic.value === '最新回复') return '/api/posts/latest-reply'
+ if (selectedTopic.value === '精选') return '/api/posts/featured'
return '/api/posts'
})
const buildUrl = ({ pageNo }) => {
diff --git a/frontend_nuxt/pages/message.vue b/frontend_nuxt/pages/message.vue
index 7d0a54723..b22f07294 100644
--- a/frontend_nuxt/pages/message.vue
+++ b/frontend_nuxt/pages/message.vue
@@ -493,6 +493,19 @@
已被管理员拒绝
+
+
+ 您的文章
+
+ {{ stripMarkdownLength(item.post.title, 100) }}
+
+ 被收录为精选
+
+
管理员
@@ -674,6 +687,8 @@ const formatType = (t) => {
return '抽奖已开奖'
case 'POST_DELETED':
return '帖子被删除'
+ case 'POST_FEATURED':
+ return '文章被精选'
default:
return t
}
diff --git a/frontend_nuxt/pages/points.vue b/frontend_nuxt/pages/points.vue
index bc1a60294..8dd37182f 100644
--- a/frontend_nuxt/pages/points.vue
+++ b/frontend_nuxt/pages/points.vue
@@ -136,6 +136,13 @@
}}
加入社区 🎉，获得 {{ item.amount }} 积分
+
+ 文章
+ {{
+ item.postTitle
+ }}
+ 被收录为精选，获得 {{ item.amount }} 积分
+
兑换商品，消耗 {{ -item.amount }} 积分
@@ -176,6 +183,7 @@ const pointRules = [
'帖子被点赞：每次 10 积分',
'评论被点赞：每次 10 积分',
'邀请好友加入可获得 500 积分/次，注意需要使用邀请链接注册',
+ '文章被收录至精选：每次 500 积分',
]
const goods = ref([])
@@ -192,6 +200,7 @@ const iconMap = {
INVITE: 'fas fa-user-plus',
SYSTEM_ONLINE: 'fas fa-clock',
REDEEM: 'fas fa-gift',
+ FEATURE: 'fas fa-star',
}
onMounted(async () => {
diff --git a/frontend_nuxt/utils/medal.js b/frontend_nuxt/utils/medal.js
index 2f61e537d..efc8ea1f8 100644
--- a/frontend_nuxt/utils/medal.js
+++ b/frontend_nuxt/utils/medal.js
@@ -1,6 +1,7 @@
export const medalTitles = {
COMMENT: '评论达人',
POST: '发帖达人',
+ FEATURED: '精选作者',
SEED: '种子用户',
CONTRIBUTOR: '贡献者',
PIONEER: '开山鼻祖',
diff --git a/frontend_nuxt/utils/notification.js b/frontend_nuxt/utils/notification.js
index e476d9fb1..2d3fcc410 100644
--- a/frontend_nuxt/utils/notification.js
+++ b/frontend_nuxt/utils/notification.js
@@ -27,6 +27,7 @@ const iconMap = {
LOTTERY_DRAW: 'fas fa-bullhorn',
MENTION: 'fas fa-at',
POST_DELETED: 'fas fa-trash',
+ POST_FEATURED: 'fas fa-star',
}
export async function fetchUnreadCount() {
@@ -267,6 +268,17 @@ function createFetchNotifications() {
}
},
})
+ } else if (n.type === 'POST_FEATURED') {
+ arr.push({
+ ...n,
+ icon: iconMap[n.type],
+ iconClick: () => {
+ if (n.post) {
+ markNotificationRead(n.id)
+ navigateTo(`/posts/${n.post.id}`, { replace: true })
+ }
+ },
+ })
} else if (n.type === 'REGISTER_REQUEST') {
arr.push({
...n,
From d3dcc98122057e396046d96dac4563bc6614755b Mon Sep 17 00:00:00 2001
From: Tim <135014430+nagisa77@users.noreply.github.com>
Date: Thu, 21 Aug 2025 16:16:49 +0800
Subject: [PATCH 23/62] fix tests for PointService dependency
---
.../java/com/openisle/service/PostServiceTest.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/backend/src/test/java/com/openisle/service/PostServiceTest.java b/backend/src/test/java/com/openisle/service/PostServiceTest.java
index 4ad621b18..6abe97238 100644
--- a/backend/src/test/java/com/openisle/service/PostServiceTest.java
+++ b/backend/src/test/java/com/openisle/service/PostServiceTest.java
@@ -34,11 +34,12 @@ class PostServiceTest {
TaskScheduler taskScheduler = mock(TaskScheduler.class);
EmailSender emailSender = mock(EmailSender.class);
ApplicationContext context = mock(ApplicationContext.class);
+ PointService pointService = mock(PointService.class);
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
notifService, subService, commentService, commentRepo,
reactionRepo, subRepo, notificationRepo, postReadService,
- imageUploader, taskScheduler, emailSender, context, PublishMode.DIRECT);
+ imageUploader, taskScheduler, emailSender, context, pointService, PublishMode.DIRECT);
when(context.getBean(PostService.class)).thenReturn(service);
Post post = new Post();
@@ -80,11 +81,12 @@ class PostServiceTest {
TaskScheduler taskScheduler = mock(TaskScheduler.class);
EmailSender emailSender = mock(EmailSender.class);
ApplicationContext context = mock(ApplicationContext.class);
+ PointService pointService = mock(PointService.class);
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
notifService, subService, commentService, commentRepo,
reactionRepo, subRepo, notificationRepo, postReadService,
- imageUploader, taskScheduler, emailSender, context, PublishMode.DIRECT);
+ imageUploader, taskScheduler, emailSender, context, pointService, PublishMode.DIRECT);
when(context.getBean(PostService.class)).thenReturn(service);
Post post = new Post();
@@ -132,11 +134,12 @@ class PostServiceTest {
TaskScheduler taskScheduler = mock(TaskScheduler.class);
EmailSender emailSender = mock(EmailSender.class);
ApplicationContext context = mock(ApplicationContext.class);
+ PointService pointService = mock(PointService.class);
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
notifService, subService, commentService, commentRepo,
reactionRepo, subRepo, notificationRepo, postReadService,
- imageUploader, taskScheduler, emailSender, context, PublishMode.DIRECT);
+ imageUploader, taskScheduler, emailSender, context, pointService, PublishMode.DIRECT);
when(context.getBean(PostService.class)).thenReturn(service);
when(postRepo.countByAuthorAfter(eq("alice"), any())).thenReturn(1L);
@@ -165,11 +168,12 @@ class PostServiceTest {
TaskScheduler taskScheduler = mock(TaskScheduler.class);
EmailSender emailSender = mock(EmailSender.class);
ApplicationContext context = mock(ApplicationContext.class);
+ PointService pointService = mock(PointService.class);
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
notifService, subService, commentService, commentRepo,
reactionRepo, subRepo, notificationRepo, postReadService,
- imageUploader, taskScheduler, emailSender, context, PublishMode.DIRECT);
+ imageUploader, taskScheduler, emailSender, context, pointService, PublishMode.DIRECT);
when(context.getBean(PostService.class)).thenReturn(service);
User author = new User();
From cf722f5707381867b4de405bdfaf649ddba28ec9 Mon Sep 17 00:00:00 2001
From: Tim
Date: Thu, 21 Aug 2025 16:30:54 +0800
Subject: [PATCH 24/62] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=A6=96?=
=?UTF-8?q?=E9=A1=B5tabs=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend_nuxt/pages/index.vue | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/frontend_nuxt/pages/index.vue b/frontend_nuxt/pages/index.vue
index d99bff85a..03e840e47 100644
--- a/frontend_nuxt/pages/index.vue
+++ b/frontend_nuxt/pages/index.vue
@@ -155,17 +155,22 @@ const route = useRoute()
const tagOptions = ref([])
const categoryOptions = ref([])
-const topics = ref(['精选', '最新回复', '最新', '排行榜' /*, '热门', '类别'*/])
+const topics = ref(['最新回复', '最新', '精选', '排行榜' /*, '热门', '类别'*/])
const selectedTopicCookie = useCookie('homeTab')
-const selectedTopic = ref(
- selectedTopicCookie.value
- ? selectedTopicCookie.value
- : route.query.view === 'ranking'
- ? '排行榜'
- : route.query.view === 'latest'
- ? '最新'
- : '最新回复',
-)
+
+let defaultTopic = '最新回复'
+
+if (selectedTopicCookie.value) {
+ defaultTopic = selectedTopicCookie.value
+} else if (route.query.view === 'ranking') {
+ defaultTopic = '排行榜'
+} else if (route.query.view === 'latest') {
+ defaultTopic = '最新'
+} else if (route.query.view === 'featured') {
+ defaultTopic = '精选'
+}
+const selectedTopic = ref(defaultTopic)
+
if (!selectedTopicCookie.value) selectedTopicCookie.value = selectedTopic.value
const articles = ref([])
const page = ref(0)
From 0b8e5500972f4216126cf85cb32aab1f8e412a68 Mon Sep 17 00:00:00 2001
From: Tim
Date: Thu, 21 Aug 2025 17:56:27 +0800
Subject: [PATCH 25/62] =?UTF-8?q?fix:=20exclude=3D=3Dnull=E4=B8=8D?=
=?UTF-8?q?=E5=88=97=E5=85=A5=E7=B2=BE=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/openisle/service/PostService.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/backend/src/main/java/com/openisle/service/PostService.java b/backend/src/main/java/com/openisle/service/PostService.java
index d62a7fa40..a3038d478 100644
--- a/backend/src/main/java/com/openisle/service/PostService.java
+++ b/backend/src/main/java/com/openisle/service/PostService.java
@@ -464,13 +464,14 @@ public class PostService {
return paginate(sortByPinnedAndCreated(posts), page, pageSize);
}
- public List listFeaturedPosts(java.util.List categoryIds,
- java.util.List tagIds,
+ public List listFeaturedPosts(List categoryIds,
+ List tagIds,
Integer page,
Integer pageSize) {
List posts;
boolean hasCategories = categoryIds != null && !categoryIds.isEmpty();
boolean hasTags = tagIds != null && !tagIds.isEmpty();
+
if (hasCategories && hasTags) {
posts = listPostsByCategoriesAndTags(categoryIds, tagIds, null, null);
} else if (hasCategories) {
@@ -480,10 +481,17 @@ public class PostService {
} else {
posts = listPosts();
}
- posts = posts.stream().filter(p -> !Boolean.TRUE.equals(p.getRssExcluded())).toList();
+
+ // 仅保留 getRssExcluded 为 0 且不为空
+ // 若字段类型是 Boolean（包装类型），0 等价于 false：
+ posts = posts.stream()
+ .filter(p -> p.getRssExcluded() != null && !p.getRssExcluded())
+ .toList();
+
return paginate(sortByPinnedAndCreated(posts), page, pageSize);
}
+
public List listPendingPosts() {
return postRepository.findByStatus(PostStatus.PENDING);
}
From f69562516d4f1aff2aaebb3dda115a0934c44951 Mon Sep 17 00:00:00 2001
From: Tim <135014430+nagisa77@users.noreply.github.com>
Date: Thu, 21 Aug 2025 19:05:10 +0800
Subject: [PATCH 26/62] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 8fa54b96b..a394d7574 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
Date: Thu, 21 Aug 2025 23:30:33 +0800
Subject: [PATCH 27/62] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=83=A8?=
=?UTF-8?q?=E5=88=86=E6=A0=B7=E5=BC=8F=E5=92=8C=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend_nuxt/components/MenuComponent.vue | 3 ++-
frontend_nuxt/pages/about/index.vue | 2 --
frontend_nuxt/pages/message.vue | 2 +-
frontend_nuxt/pages/new-post.vue | 2 +-
frontend_nuxt/pages/posts/[id]/edit.vue | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/frontend_nuxt/components/MenuComponent.vue b/frontend_nuxt/components/MenuComponent.vue
index 7b52bae54..e60fa75ee 100644
--- a/frontend_nuxt/components/MenuComponent.vue
+++ b/frontend_nuxt/components/MenuComponent.vue
@@ -262,7 +262,7 @@ const gotoTag = (t) => {
top: var(--header-height);
width: 220px;
background-color: var(--app-menu-background-color);
- height: calc(100vh - 20px - var(--header-height));
+ height: calc(100vh - var(--header-height));
border-right: 1px solid var(--menu-border-color);
display: flex;
flex-direction: column;
@@ -348,6 +348,7 @@ const gotoTag = (t) => {
display: flex;
align-items: center;
justify-content: center;
+ cursor: pointer;
}
.menu-section {
diff --git a/frontend_nuxt/pages/about/index.vue b/frontend_nuxt/pages/about/index.vue
index 1858a6402..8d5aaa60f 100644
--- a/frontend_nuxt/pages/about/index.vue
+++ b/frontend_nuxt/pages/about/index.vue
@@ -98,9 +98,7 @@ export default {
}
.about-tabs {
- position: sticky;
top: calc(var(--header-height) + 1px);
- z-index: 200;
background-color: var(--background-color-blur);
display: flex;
flex-direction: row;
diff --git a/frontend_nuxt/pages/message.vue b/frontend_nuxt/pages/message.vue
index b22f07294..d694b1b2d 100644
--- a/frontend_nuxt/pages/message.vue
+++ b/frontend_nuxt/pages/message.vue
@@ -724,6 +724,7 @@ onActivated(async () => {
justify-content: space-between;
align-items: center;
backdrop-filter: var(--blur-10);
+ border-bottom: 1px solid var(--normal-border-color);
}
.message-page-header-right {
@@ -837,7 +838,6 @@ onActivated(async () => {
.message-tabs {
display: flex;
flex-direction: row;
- border-bottom: 1px solid var(--normal-border-color);
}
.message-tab-item {
diff --git a/frontend_nuxt/pages/new-post.vue b/frontend_nuxt/pages/new-post.vue
index 1d7a7e1f8..ed64f63f5 100644
--- a/frontend_nuxt/pages/new-post.vue
+++ b/frontend_nuxt/pages/new-post.vue
@@ -16,7 +16,7 @@
{
}
}
+const sendMessage = async () => {
+ const token = getToken()
+ if (!token) {
+ toast.error('请先登录')
+ return
+ }
+ try {
+ const response = await fetch(`${API_BASE_URL}/api/messages/conversations`, {
+ method: 'POST',
+ body: JSON.stringify({
+ recipientId: user.value.id,
+ }),
+ headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
+ });
+ const result = await response.json();
+ router.push(`/messages/${result.conversationId}`);
+ } catch (e) {
+ toast.error('无法发起私信');
+ console.error(e);
+ }
+};
+
const gotoTag = (tag) => {
const value = encodeURIComponent(tag.id ?? tag.name)
navigateTo({ path: '/', query: { tags: value } }, { replace: true })
diff --git a/frontend_nuxt/public/default-avatar.svg b/frontend_nuxt/public/default-avatar.svg
new file mode 100644
index 000000000..5b773a4ca
--- /dev/null
+++ b/frontend_nuxt/public/default-avatar.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend_nuxt/utils/messageTime.js b/frontend_nuxt/utils/messageTime.js
new file mode 100644
index 000000000..f83cf9b55
--- /dev/null
+++ b/frontend_nuxt/utils/messageTime.js
@@ -0,0 +1,12 @@
+export function formatMessageTime(input) {
+ const date = new Date(input)
+ if (Number.isNaN(date.getTime())) return ''
+
+ const year = date.getFullYear()
+ const month = (date.getMonth() + 1).toString().padStart(2, '0')
+ const day = date.getDate().toString().padStart(2, '0')
+ const hours = date.getHours().toString().padStart(2, '0')
+ const minutes = date.getMinutes().toString().padStart(2, '0')
+
+ return `${year}-${month}-${day} ${hours}:${minutes}`
+}
\ No newline at end of file
From c009616f74831e615b190bad4ecc25f534c9a8aa Mon Sep 17 00:00:00 2001
From: Palm Civet
Date: Thu, 21 Aug 2025 23:44:11 +0800
Subject: [PATCH 30/62] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=83=A8?=
=?UTF-8?q?=E5=88=86=E6=96=87=E6=A1=88=E5=92=8C=20tags=20=E9=A1=B5?=
=?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend_nuxt/components/MenuComponent.vue | 2 +-
frontend_nuxt/pages/index.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/frontend_nuxt/components/MenuComponent.vue b/frontend_nuxt/components/MenuComponent.vue
index e60fa75ee..72e8d3ede 100644
--- a/frontend_nuxt/components/MenuComponent.vue
+++ b/frontend_nuxt/components/MenuComponent.vue
@@ -106,7 +106,7 @@
@@ -55,11 +55,11 @@ import { ref, onMounted, onUnmounted, nextTick, computed, watch, onActivated, on
import { useRoute } from 'vue-router';
import { getToken, fetchCurrentUser } from '~/utils/auth';
import { toast } from '~/main';
-import { formatMessageTime } from '~/utils/messageTime';
import { renderMarkdown } from '~/utils/markdown';
import MessageEditor from '~/components/MessageEditor.vue';
import { useWebSocket } from '~/composables/useWebSocket';
import { useUnreadCount } from '~/composables/useUnreadCount';
+import TimeManager from '~/utils/time'
const config = useRuntimeConfig();
const route = useRoute();
diff --git a/frontend_nuxt/pages/messages/index.vue b/frontend_nuxt/pages/messages/index.vue
index 085a1d96c..cd44a2055 100644
--- a/frontend_nuxt/pages/messages/index.vue
+++ b/frontend_nuxt/pages/messages/index.vue
@@ -61,9 +61,9 @@ import { ref, onMounted, onUnmounted, watch, onActivated } from 'vue';
import { useRouter } from 'vue-router';
import { getToken, fetchCurrentUser } from '~/utils/auth'
import { toast } from '~/main'
-import { formatMessageTime } from '~/utils/messageTime'
import { useWebSocket } from '~/composables/useWebSocket';
import { useUnreadCount } from '~/composables/useUnreadCount';
+import TimeManager from '~/utils/time'
const config = useRuntimeConfig()
const conversations = ref([]);
@@ -108,7 +108,7 @@ function getOtherParticipant(conversation) {
// 格式化时间
function formatTime(timeString) {
if (!timeString) return ''
- return formatMessageTime(timeString)
+ return TimeManager.format(timeString)
}
// 头像加载失败处理
diff --git a/frontend_nuxt/utils/messageTime.js b/frontend_nuxt/utils/messageTime.js
deleted file mode 100644
index f83cf9b55..000000000
--- a/frontend_nuxt/utils/messageTime.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export function formatMessageTime(input) {
- const date = new Date(input)
- if (Number.isNaN(date.getTime())) return ''
-
- const year = date.getFullYear()
- const month = (date.getMonth() + 1).toString().padStart(2, '0')
- const day = date.getDate().toString().padStart(2, '0')
- const hours = date.getHours().toString().padStart(2, '0')
- const minutes = date.getMinutes().toString().padStart(2, '0')
-
- return `${year}-${month}-${day} ${hours}:${minutes}`
-}
\ No newline at end of file
From 4af10ecf79cbf7686bf1995eb448693066c070d5 Mon Sep 17 00:00:00 2001
From: Tim
- 高效的开源社区前后端端平台
+ 高效的开源社区前后端平台
清空
- md格式优化
+ MD 格式优化
diff --git a/frontend_nuxt/pages/posts/[id]/edit.vue b/frontend_nuxt/pages/posts/[id]/edit.vue
index 86ecdfd6f..b8d57a252 100644
--- a/frontend_nuxt/pages/posts/[id]/edit.vue
+++ b/frontend_nuxt/pages/posts/[id]/edit.vue
@@ -15,7 +15,7 @@
![]()
+
+
+
+
+
清空
- md格式优化
+ MD 格式优化
取消
Date: Thu, 21 Aug 2025 23:40:31 +0800
Subject: [PATCH 28/62] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=20tags=20?=
=?UTF-8?q?=E9=A1=B5=E5=AF=BC=E8=88=AA=E6=A0=8F=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend_nuxt/pages/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend_nuxt/pages/index.vue b/frontend_nuxt/pages/index.vue
index 03e840e47..5dc58c900 100644
--- a/frontend_nuxt/pages/index.vue
+++ b/frontend_nuxt/pages/index.vue
@@ -449,7 +449,7 @@ const sanitizeDescription = (text) => stripMarkdown(text)
}
.topic-item {
- padding: 2px 10px;
+ padding: 10px 20px;
cursor: pointer;
}
From 84ab87878a229bb77325006e7337fbf32583c567 Mon Sep 17 00:00:00 2001
From: zpaeng
Date: Thu, 21 Aug 2025 23:42:53 +0800
Subject: [PATCH 29/62] =?UTF-8?q?feat:=E3=80=90=E7=AB=99=E5=86=85=E4=BF=A1?=
=?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/pom.xml | 4 +
.../com/openisle/config/SecurityConfig.java | 5 +-
.../com/openisle/config/WebSocketConfig.java | 79 +++
.../controller/MessageController.java | 117 +++++
.../openisle/dto/ConversationDetailDto.java | 13 +
.../com/openisle/dto/ConversationDto.java | 17 +
.../dto/CreateConversationRequest.java | 8 +
.../dto/CreateConversationResponse.java | 12 +
.../java/com/openisle/dto/MessageDto.java | 13 +
.../java/com/openisle/dto/UserSummaryDto.java | 10 +
.../main/java/com/openisle/model/Message.java | 35 ++
.../openisle/model/MessageConversation.java | 36 ++
.../openisle/model/MessageParticipant.java | 30 ++
.../MessageConversationRepository.java | 31 ++
.../MessageParticipantRepository.java | 14 +
.../repository/MessageRepository.java | 21 +
.../com/openisle/service/MessageService.java | 217 ++++++++
frontend_nuxt/components/HeaderComponent.vue | 47 +-
frontend_nuxt/components/MessageEditor.vue | 183 +++++++
frontend_nuxt/composables/useUnreadCount.js | 93 ++++
frontend_nuxt/composables/useWebSocket.js | 85 +++
frontend_nuxt/package.json | 4 +-
frontend_nuxt/pages/messages/[id].vue | 490 ++++++++++++++++++
frontend_nuxt/pages/messages/index.vue | 375 ++++++++++++++
frontend_nuxt/pages/users/[id].vue | 32 +-
frontend_nuxt/public/default-avatar.svg | 1 +
frontend_nuxt/utils/messageTime.js | 12 +
27 files changed, 1970 insertions(+), 14 deletions(-)
create mode 100644 backend/src/main/java/com/openisle/config/WebSocketConfig.java
create mode 100644 backend/src/main/java/com/openisle/controller/MessageController.java
create mode 100644 backend/src/main/java/com/openisle/dto/ConversationDetailDto.java
create mode 100644 backend/src/main/java/com/openisle/dto/ConversationDto.java
create mode 100644 backend/src/main/java/com/openisle/dto/CreateConversationRequest.java
create mode 100644 backend/src/main/java/com/openisle/dto/CreateConversationResponse.java
create mode 100644 backend/src/main/java/com/openisle/dto/MessageDto.java
create mode 100644 backend/src/main/java/com/openisle/dto/UserSummaryDto.java
create mode 100644 backend/src/main/java/com/openisle/model/Message.java
create mode 100644 backend/src/main/java/com/openisle/model/MessageConversation.java
create mode 100644 backend/src/main/java/com/openisle/model/MessageParticipant.java
create mode 100644 backend/src/main/java/com/openisle/repository/MessageConversationRepository.java
create mode 100644 backend/src/main/java/com/openisle/repository/MessageParticipantRepository.java
create mode 100644 backend/src/main/java/com/openisle/repository/MessageRepository.java
create mode 100644 backend/src/main/java/com/openisle/service/MessageService.java
create mode 100644 frontend_nuxt/components/MessageEditor.vue
create mode 100644 frontend_nuxt/composables/useUnreadCount.js
create mode 100644 frontend_nuxt/composables/useWebSocket.js
create mode 100644 frontend_nuxt/pages/messages/[id].vue
create mode 100644 frontend_nuxt/pages/messages/index.vue
create mode 100644 frontend_nuxt/public/default-avatar.svg
create mode 100644 frontend_nuxt/utils/messageTime.js
diff --git a/backend/pom.xml b/backend/pom.xml
index 56c4048eb..4193590b6 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -26,6 +26,10 @@
org.springframework.boot
spring-boot-starter-web
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
org.slf4j
slf4j-api
diff --git a/backend/src/main/java/com/openisle/config/SecurityConfig.java b/backend/src/main/java/com/openisle/config/SecurityConfig.java
index 9fabbacbd..5fca385de 100644
--- a/backend/src/main/java/com/openisle/config/SecurityConfig.java
+++ b/backend/src/main/java/com/openisle/config/SecurityConfig.java
@@ -92,7 +92,7 @@ public class SecurityConfig {
cfg.setAllowedHeaders(List.of("*"));
cfg.setAllowCredentials(true);
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
- source.registerCorsConfiguration("/api/**", cfg);
+ source.registerCorsConfiguration("/**", cfg);
return source;
}
@@ -104,6 +104,7 @@ public class SecurityConfig {
.exceptionHandling(eh -> eh.accessDeniedHandler(customAccessDeniedHandler))
.authorizeHttpRequests(auth -> auth
.requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
+ .requestMatchers("/ws/**").permitAll()
.requestMatchers(HttpMethod.POST, "/api/auth/**").permitAll()
.requestMatchers(HttpMethod.GET, "/api/posts/**").permitAll()
.requestMatchers(HttpMethod.GET, "/api/comments/**").permitAll()
@@ -172,7 +173,7 @@ public class SecurityConfig {
response.getWriter().write("{\"error\": \"Invalid or expired token\"}");
return;
}
- } else if (!uri.startsWith("/api/auth") && !publicGet) {
+ } else if (!uri.startsWith("/api/auth") && !publicGet && !uri.startsWith("/ws")) {
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
response.setContentType("application/json");
response.getWriter().write("{\"error\": \"Missing token\"}");
diff --git a/backend/src/main/java/com/openisle/config/WebSocketConfig.java b/backend/src/main/java/com/openisle/config/WebSocketConfig.java
new file mode 100644
index 000000000..309921fb9
--- /dev/null
+++ b/backend/src/main/java/com/openisle/config/WebSocketConfig.java
@@ -0,0 +1,79 @@
+package com.openisle.config;
+
+import com.openisle.service.JwtService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.simp.config.ChannelRegistration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.messaging.simp.stomp.StompCommand;
+import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
+import org.springframework.messaging.support.ChannelInterceptor;
+import org.springframework.messaging.support.MessageHeaderAccessor;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+
+@Configuration
+@EnableWebSocketMessageBroker
+@RequiredArgsConstructor
+public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+ private final JwtService jwtService;
+ private final UserDetailsService userDetailsService;
+
+ @Override
+ public void configureMessageBroker(MessageBrokerRegistry config) {
+ // Enable a simple memory-based message broker to carry the messages back to the client on destinations prefixed with "/topic" and "/queue"
+ config.enableSimpleBroker("/topic", "/queue");
+ // Set user destination prefix for personal messages
+ config.setUserDestinationPrefix("/user");
+ // Designates the "/app" prefix for messages that are bound for @MessageMapping-annotated methods.
+ config.setApplicationDestinationPrefixes("/app");
+ }
+
+ @Override
+ public void registerStompEndpoints(StompEndpointRegistry registry) {
+ // Registers the "/ws" endpoint, enabling SockJS fallback options so that alternate transports may be used if WebSocket is not available.
+ registry.addEndpoint("/ws").setAllowedOriginPatterns("*").withSockJS();
+ }
+
+ @Override
+ public void configureClientInboundChannel(ChannelRegistration registration) {
+ registration.interceptors(new ChannelInterceptor() {
+ @Override
+ public Message preSend(Message message, MessageChannel channel) {
+ StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
+
+ if (StompCommand.CONNECT.equals(accessor.getCommand())) {
+ System.out.println("WebSocket CONNECT command received");
+ String authHeader = accessor.getFirstNativeHeader("Authorization");
+ System.out.println("Authorization header: " + (authHeader != null ? "present" : "missing"));
+
+ if (authHeader != null && authHeader.startsWith("Bearer ")) {
+ String token = authHeader.substring(7);
+ try {
+ String username = jwtService.validateAndGetSubject(token);
+ System.out.println("JWT validated for user: " + username);
+ var userDetails = userDetailsService.loadUserByUsername(username);
+ Authentication auth = new UsernamePasswordAuthenticationToken(
+ userDetails, null, userDetails.getAuthorities());
+ accessor.setUser(auth);
+ System.out.println("WebSocket user set: " + username);
+ } catch (Exception e) {
+ System.err.println("JWT validation failed: " + e.getMessage());
+ }
+ }
+ } else if (StompCommand.SUBSCRIBE.equals(accessor.getCommand())) {
+ System.out.println("WebSocket SUBSCRIBE to: " + accessor.getDestination());
+ System.out.println("WebSocket user during subscribe: " + (accessor.getUser() != null ? accessor.getUser().getName() : "null"));
+ }
+ return message;
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/openisle/controller/MessageController.java b/backend/src/main/java/com/openisle/controller/MessageController.java
new file mode 100644
index 000000000..c599fc785
--- /dev/null
+++ b/backend/src/main/java/com/openisle/controller/MessageController.java
@@ -0,0 +1,117 @@
+package com.openisle.controller;
+
+import com.openisle.dto.ConversationDetailDto;
+import com.openisle.dto.ConversationDto;
+import com.openisle.dto.CreateConversationRequest;
+import com.openisle.dto.CreateConversationResponse;
+import com.openisle.dto.MessageDto;
+import com.openisle.dto.UserSummaryDto;
+import com.openisle.model.Message;
+import com.openisle.model.MessageConversation;
+import com.openisle.model.User;
+import com.openisle.repository.UserRepository;
+import com.openisle.service.MessageService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/messages")
+@RequiredArgsConstructor
+public class MessageController {
+
+ private final MessageService messageService;
+ private final UserRepository userRepository;
+
+ // This is a placeholder for getting the current user's ID
+ private Long getCurrentUserId(Authentication auth) {
+ User user = userRepository.findByUsername(auth.getName()).orElseThrow(() -> new IllegalArgumentException("Sender not found"));
+ // In a real application, you would get this from the Authentication object
+ return user.getId();
+ }
+
+ @GetMapping("/conversations")
+ public ResponseEntity> getConversations(Authentication auth) {
+ List conversations = messageService.getConversations(getCurrentUserId(auth));
+ return ResponseEntity.ok(conversations);
+ }
+
+ @GetMapping("/conversations/{conversationId}")
+ public ResponseEntity getMessages(@PathVariable Long conversationId,
+ @RequestParam(defaultValue = "0") int page,
+ @RequestParam(defaultValue = "20") int size,
+ Authentication auth) {
+ Pageable pageable = PageRequest.of(page, size, Sort.by("createdAt").descending());
+ ConversationDetailDto conversationDetails = messageService.getConversationDetails(conversationId, getCurrentUserId(auth), pageable);
+ return ResponseEntity.ok(conversationDetails);
+ }
+
+ @PostMapping
+ public ResponseEntity sendMessage(@RequestBody MessageRequest req, Authentication auth) {
+ Message message = messageService.sendMessage(getCurrentUserId(auth), req.getRecipientId(), req.getContent());
+ return ResponseEntity.ok(toDto(message));
+ }
+
+ @PostMapping("/conversations/{conversationId}/read")
+ public ResponseEntity markAsRead(@PathVariable Long conversationId, Authentication auth) {
+ messageService.markConversationAsRead(conversationId, getCurrentUserId(auth));
+ return ResponseEntity.ok().build();
+ }
+
+ @PostMapping("/conversations")
+ public ResponseEntity findOrCreateConversation(@RequestBody CreateConversationRequest req, Authentication auth) {
+ MessageConversation conversation = messageService.findOrCreateConversation(getCurrentUserId(auth), req.getRecipientId());
+ return ResponseEntity.ok(new CreateConversationResponse(conversation.getId()));
+ }
+
+ private MessageDto toDto(Message message) {
+ MessageDto dto = new MessageDto();
+ dto.setId(message.getId());
+ dto.setContent(message.getContent());
+ dto.setCreatedAt(message.getCreatedAt());
+
+ dto.setConversationId(message.getConversation().getId());
+
+ UserSummaryDto senderDto = new UserSummaryDto();
+ senderDto.setId(message.getSender().getId());
+ senderDto.setUsername(message.getSender().getUsername());
+ senderDto.setAvatar(message.getSender().getAvatar());
+ dto.setSender(senderDto);
+
+ return dto;
+ }
+
+ @GetMapping("/unread-count")
+ public ResponseEntity getUnreadCount(Authentication auth) {
+ return ResponseEntity.ok(messageService.getUnreadMessageCount(getCurrentUserId(auth)));
+ }
+
+ // A simple request DTO
+ static class MessageRequest {
+ private Long recipientId;
+ private String content;
+
+ public Long getRecipientId() {
+ return recipientId;
+ }
+
+ public void setRecipientId(Long recipientId) {
+ this.recipientId = recipientId;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+ }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/openisle/dto/ConversationDetailDto.java b/backend/src/main/java/com/openisle/dto/ConversationDetailDto.java
new file mode 100644
index 000000000..96f548c45
--- /dev/null
+++ b/backend/src/main/java/com/openisle/dto/ConversationDetailDto.java
@@ -0,0 +1,13 @@
+package com.openisle.dto;
+
+import lombok.Data;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+@Data
+public class ConversationDetailDto {
+ private Long id;
+ private List participants;
+ private Page messages;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/openisle/dto/ConversationDto.java b/backend/src/main/java/com/openisle/dto/ConversationDto.java
new file mode 100644
index 000000000..17796f2c9
--- /dev/null
+++ b/backend/src/main/java/com/openisle/dto/ConversationDto.java
@@ -0,0 +1,17 @@
+package com.openisle.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Getter
+@Setter
+public class ConversationDto {
+ private Long id;
+ private MessageDto lastMessage;
+ private List participants;
+ private LocalDateTime createdAt;
+ private long unreadCount;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/openisle/dto/CreateConversationRequest.java b/backend/src/main/java/com/openisle/dto/CreateConversationRequest.java
new file mode 100644
index 000000000..611557360
--- /dev/null
+++ b/backend/src/main/java/com/openisle/dto/CreateConversationRequest.java
@@ -0,0 +1,8 @@
+package com.openisle.dto;
+
+import lombok.Data;
+
+@Data
+public class CreateConversationRequest {
+ private Long recipientId;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/openisle/dto/CreateConversationResponse.java b/backend/src/main/java/com/openisle/dto/CreateConversationResponse.java
new file mode 100644
index 000000000..349f120f9
--- /dev/null
+++ b/backend/src/main/java/com/openisle/dto/CreateConversationResponse.java
@@ -0,0 +1,12 @@
+package com.openisle.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CreateConversationResponse {
+ private Long conversationId;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/openisle/dto/MessageDto.java b/backend/src/main/java/com/openisle/dto/MessageDto.java
new file mode 100644
index 000000000..ff536cf84
--- /dev/null
+++ b/backend/src/main/java/com/openisle/dto/MessageDto.java
@@ -0,0 +1,13 @@
+package com.openisle.dto;
+
+import lombok.Data;
+import java.time.LocalDateTime;
+
+@Data
+public class MessageDto {
+ private Long id;
+ private String content;
+ private UserSummaryDto sender;
+ private Long conversationId;
+ private LocalDateTime createdAt;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/openisle/dto/UserSummaryDto.java b/backend/src/main/java/com/openisle/dto/UserSummaryDto.java
new file mode 100644
index 000000000..5df8254a4
--- /dev/null
+++ b/backend/src/main/java/com/openisle/dto/UserSummaryDto.java
@@ -0,0 +1,10 @@
+package com.openisle.dto;
+
+import lombok.Data;
+
+@Data
+public class UserSummaryDto {
+ private Long id;
+ private String username;
+ private String avatar;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/openisle/model/Message.java b/backend/src/main/java/com/openisle/model/Message.java
new file mode 100644
index 000000000..2cd1d4cca
--- /dev/null
+++ b/backend/src/main/java/com/openisle/model/Message.java
@@ -0,0 +1,35 @@
+package com.openisle.model;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.CreationTimestamp;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@Table(name = "messages")
+public class Message {
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Long id;
+
+ @ManyToOne(optional = false, fetch = FetchType.LAZY)
+ @JoinColumn(name = "conversation_id")
+ private MessageConversation conversation;
+
+ @ManyToOne(optional = false, fetch = FetchType.LAZY)
+ @JoinColumn(name = "sender_id")
+ private User sender;
+
+ @Column(nullable = false, columnDefinition = "TEXT")
+ private String content;
+
+ @CreationTimestamp
+ @Column(nullable = false, updatable = false)
+ private LocalDateTime createdAt;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/openisle/model/MessageConversation.java b/backend/src/main/java/com/openisle/model/MessageConversation.java
new file mode 100644
index 000000000..9f9c94971
--- /dev/null
+++ b/backend/src/main/java/com/openisle/model/MessageConversation.java
@@ -0,0 +1,36 @@
+package com.openisle.model;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.CreationTimestamp;
+
+import java.time.LocalDateTime;
+import java.util.HashSet;
+import java.util.Set;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@Table(name = "message_conversations")
+public class MessageConversation {
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Long id;
+
+ @CreationTimestamp
+ @Column(nullable = false, updatable = false)
+ private LocalDateTime createdAt;
+
+ @OneToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "last_message_id")
+ private Message lastMessage;
+
+ @OneToMany(mappedBy = "conversation", cascade = CascadeType.ALL, orphanRemoval = true)
+ private Set participants = new HashSet<>();
+
+ @OneToMany(mappedBy = "conversation", cascade = CascadeType.ALL, orphanRemoval = true)
+ private Set messages = new HashSet<>();
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/openisle/model/MessageParticipant.java b/backend/src/main/java/com/openisle/model/MessageParticipant.java
new file mode 100644
index 000000000..d69901c8f
--- /dev/null
+++ b/backend/src/main/java/com/openisle/model/MessageParticipant.java
@@ -0,0 +1,30 @@
+package com.openisle.model;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@Table(name = "message_participants")
+public class MessageParticipant {
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Long id;
+
+ @ManyToOne(optional = false, fetch = FetchType.LAZY)
+ @JoinColumn(name = "conversation_id")
+ private MessageConversation conversation;
+
+ @ManyToOne(optional = false, fetch = FetchType.LAZY)
+ @JoinColumn(name = "user_id")
+ private User user;
+
+ @Column
+ private LocalDateTime lastReadAt;
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/openisle/repository/MessageConversationRepository.java b/backend/src/main/java/com/openisle/repository/MessageConversationRepository.java
new file mode 100644
index 000000000..ef8bacb6c
--- /dev/null
+++ b/backend/src/main/java/com/openisle/repository/MessageConversationRepository.java
@@ -0,0 +1,31 @@
+package com.openisle.repository;
+
+import com.openisle.model.MessageConversation;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.openisle.model.User;
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Optional;
+import com.openisle.model.User;
+import java.util.List;
+
+@Repository
+public interface MessageConversationRepository extends JpaRepository {
+ @Query("SELECT c FROM MessageConversation c JOIN c.participants p1 JOIN c.participants p2 WHERE p1.user = :user1 AND p2.user = :user2")
+ Optional findConversationByUsers(@Param("user1") User user1, @Param("user2") User user2);
+
+ @Query("SELECT DISTINCT c FROM MessageConversation c " +
+ "JOIN c.participants p " +
+ "LEFT JOIN FETCH c.lastMessage lm " +
+ "LEFT JOIN FETCH lm.sender " +
+ "LEFT JOIN FETCH c.participants cp " +
+ "LEFT JOIN FETCH cp.user " +
+ "WHERE p.user.id = :userId " +
+ "ORDER BY COALESCE(lm.createdAt, c.createdAt) DESC")
+ List findConversationsByUserIdOrderByLastMessageDesc(@Param("userId") Long userId);
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/openisle/repository/MessageParticipantRepository.java b/backend/src/main/java/com/openisle/repository/MessageParticipantRepository.java
new file mode 100644
index 000000000..3c63bccbd
--- /dev/null
+++ b/backend/src/main/java/com/openisle/repository/MessageParticipantRepository.java
@@ -0,0 +1,14 @@
+package com.openisle.repository;
+
+import com.openisle.model.MessageParticipant;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public interface MessageParticipantRepository extends JpaRepository {
+ Optional findByConversationIdAndUserId(Long conversationId, Long userId);
+ List findByUserId(Long userId);
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/openisle/repository/MessageRepository.java b/backend/src/main/java/com/openisle/repository/MessageRepository.java
new file mode 100644
index 000000000..9c89a0247
--- /dev/null
+++ b/backend/src/main/java/com/openisle/repository/MessageRepository.java
@@ -0,0 +1,21 @@
+package com.openisle.repository;
+
+import com.openisle.model.Message;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface MessageRepository extends JpaRepository {
+ List findByConversationIdOrderByCreatedAtAsc(Long conversationId);
+
+ Page findByConversationId(Long conversationId, Pageable pageable);
+
+ long countByConversationIdAndCreatedAtAfter(Long conversationId, java.time.LocalDateTime createdAt);
+
+ // 只计算不是指定用户发送的消息（即别人发给当前用户的消息）
+ long countByConversationIdAndCreatedAtAfterAndSenderIdNot(Long conversationId, java.time.LocalDateTime createdAt, Long senderId);
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/openisle/service/MessageService.java b/backend/src/main/java/com/openisle/service/MessageService.java
new file mode 100644
index 000000000..3e668742e
--- /dev/null
+++ b/backend/src/main/java/com/openisle/service/MessageService.java
@@ -0,0 +1,217 @@
+package com.openisle.service;
+
+import com.openisle.model.Message;
+import com.openisle.model.MessageConversation;
+import com.openisle.model.MessageParticipant;
+import com.openisle.model.User;
+import com.openisle.repository.MessageConversationRepository;
+import com.openisle.repository.MessageParticipantRepository;
+import com.openisle.repository.MessageRepository;
+import com.openisle.repository.UserRepository;
+import com.openisle.dto.ConversationDetailDto;
+import com.openisle.dto.ConversationDto;
+import com.openisle.dto.MessageDto;
+import com.openisle.dto.UserSummaryDto;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class MessageService {
+
+ private final MessageRepository messageRepository;
+ private final MessageConversationRepository conversationRepository;
+ private final MessageParticipantRepository participantRepository;
+ private final UserRepository userRepository;
+ private final SimpMessagingTemplate messagingTemplate;
+
+ @Transactional
+ public Message sendMessage(Long senderId, Long recipientId, String content) {
+ log.info("Attempting to send message from user {} to user {}", senderId, recipientId);
+ User sender = userRepository.findById(senderId)
+ .orElseThrow(() -> new IllegalArgumentException("Sender not found"));
+ User recipient = userRepository.findById(recipientId)
+ .orElseThrow(() -> new IllegalArgumentException("Recipient not found"));
+
+ log.info("Finding or creating conversation for users {} and {}", sender.getUsername(), recipient.getUsername());
+ MessageConversation conversation = findOrCreateConversation(sender, recipient);
+ log.info("Conversation found or created with ID: {}", conversation.getId());
+
+ Message message = new Message();
+ message.setConversation(conversation);
+ message.setSender(sender);
+ message.setContent(content);
+ message = messageRepository.save(message);
+ log.info("Message saved with ID: {}", message.getId());
+
+ conversation.setLastMessage(message);
+ conversationRepository.save(conversation);
+ log.info("Conversation {} updated with last message ID {}", conversation.getId(), message.getId());
+
+ // Broadcast the new message to subscribed clients
+ MessageDto messageDto = toDto(message);
+ String conversationDestination = "/topic/conversation/" + conversation.getId();
+ messagingTemplate.convertAndSend(conversationDestination, messageDto);
+ log.info("Message {} broadcasted to destination: {}", message.getId(), conversationDestination);
+
+ // Also notify the recipient on their personal channel to update the conversation list
+ String userDestination = "/topic/user/" + recipient.getId() + "/messages";
+ messagingTemplate.convertAndSend(userDestination, messageDto);
+ log.info("Message {} notification sent to destination: {}", message.getId(), userDestination);
+
+ // Notify recipient of new unread count
+ long unreadCount = getUnreadMessageCount(recipientId);
+ log.info("Calculating unread count for user {}: {}", recipientId, unreadCount);
+
+ // Send using username instead of user ID for WebSocket routing
+ String recipientUsername = recipient.getUsername();
+ messagingTemplate.convertAndSendToUser(recipientUsername, "/queue/unread-count", unreadCount);
+ log.info("Sent unread count {} to user {} (username: {}) via WebSocket destination: /user/{}/queue/unread-count",
+ unreadCount, recipientId, recipientUsername, recipientUsername);
+
+ return message;
+ }
+
+ private MessageDto toDto(Message message) {
+ MessageDto dto = new MessageDto();
+ dto.setId(message.getId());
+ dto.setContent(message.getContent());
+ dto.setConversationId(message.getConversation().getId());
+ dto.setCreatedAt(message.getCreatedAt());
+
+ UserSummaryDto userSummaryDto = new UserSummaryDto();
+ userSummaryDto.setId(message.getSender().getId());
+ userSummaryDto.setUsername(message.getSender().getUsername());
+ userSummaryDto.setAvatar(message.getSender().getAvatar());
+ dto.setSender(userSummaryDto);
+
+ return dto;
+ }
+
+ public MessageConversation findOrCreateConversation(Long user1Id, Long user2Id) {
+ User user1 = userRepository.findById(user1Id)
+ .orElseThrow(() -> new IllegalArgumentException("User1 not found"));
+ User user2 = userRepository.findById(user2Id)
+ .orElseThrow(() -> new IllegalArgumentException("User2 not found"));
+ return findOrCreateConversation(user1, user2);
+ }
+
+ private MessageConversation findOrCreateConversation(User user1, User user2) {
+ log.info("Searching for existing conversation between {} and {}", user1.getUsername(), user2.getUsername());
+ return conversationRepository.findConversationByUsers(user1, user2)
+ .orElseGet(() -> {
+ log.info("No existing conversation found. Creating a new one.");
+ MessageConversation conversation = new MessageConversation();
+ conversation = conversationRepository.save(conversation);
+ log.info("New conversation created with ID: {}", conversation.getId());
+
+ MessageParticipant participant1 = new MessageParticipant();
+ participant1.setConversation(conversation);
+ participant1.setUser(user1);
+ participantRepository.save(participant1);
+ log.info("Participant {} added to conversation {}", user1.getUsername(), conversation.getId());
+
+ MessageParticipant participant2 = new MessageParticipant();
+ participant2.setConversation(conversation);
+ participant2.setUser(user2);
+ participantRepository.save(participant2);
+ log.info("Participant {} added to conversation {}", user2.getUsername(), conversation.getId());
+
+ return conversation;
+ });
+ }
+
+ @Transactional(readOnly = true)
+ public List getConversations(Long userId) {
+ List conversations = conversationRepository.findConversationsByUserIdOrderByLastMessageDesc(userId);
+ return conversations.stream().map(c -> toDto(c, userId)).collect(Collectors.toList());
+ }
+
+ private ConversationDto toDto(MessageConversation conversation, Long userId) {
+ ConversationDto dto = new ConversationDto();
+ dto.setId(conversation.getId());
+ dto.setCreatedAt(conversation.getCreatedAt());
+ if (conversation.getLastMessage() != null) {
+ dto.setLastMessage(toDto(conversation.getLastMessage()));
+ }
+ dto.setParticipants(conversation.getParticipants().stream()
+ .map(p -> {
+ UserSummaryDto userDto = new UserSummaryDto();
+ userDto.setId(p.getUser().getId());
+ userDto.setUsername(p.getUser().getUsername());
+ userDto.setAvatar(p.getUser().getAvatar());
+ return userDto;
+ })
+ .collect(Collectors.toList()));
+
+ MessageParticipant self = conversation.getParticipants().stream()
+ .filter(p -> p.getUser().getId().equals(userId))
+ .findFirst()
+ .orElseThrow(() -> new IllegalStateException("Participant not found in conversation"));
+
+ LocalDateTime lastRead = self.getLastReadAt() == null ? LocalDateTime.of(1970, 1, 1, 0, 0) : self.getLastReadAt();
+ // 只计算别人发送给当前用户的未读消息
+ long unreadCount = messageRepository.countByConversationIdAndCreatedAtAfterAndSenderIdNot(conversation.getId(), lastRead, userId);
+ dto.setUnreadCount(unreadCount);
+
+ return dto;
+ }
+
+ @Transactional
+ public ConversationDetailDto getConversationDetails(Long conversationId, Long userId, Pageable pageable) {
+ markConversationAsRead(conversationId, userId);
+
+ MessageConversation conversation = conversationRepository.findById(conversationId)
+ .orElseThrow(() -> new IllegalArgumentException("Conversation not found"));
+
+ Page messagesPage = messageRepository.findByConversationId(conversationId, pageable);
+ Page messageDtoPage = messagesPage.map(this::toDto);
+
+ List participants = conversation.getParticipants().stream()
+ .map(p -> {
+ UserSummaryDto userDto = new UserSummaryDto();
+ userDto.setId(p.getUser().getId());
+ userDto.setUsername(p.getUser().getUsername());
+ userDto.setAvatar(p.getUser().getAvatar());
+ return userDto;
+ })
+ .collect(Collectors.toList());
+
+ ConversationDetailDto detailDto = new ConversationDetailDto();
+ detailDto.setId(conversation.getId());
+ detailDto.setParticipants(participants);
+ detailDto.setMessages(messageDtoPage);
+
+ return detailDto;
+ }
+
+ @Transactional
+ public void markConversationAsRead(Long conversationId, Long userId) {
+ MessageParticipant participant = participantRepository.findByConversationIdAndUserId(conversationId, userId)
+ .orElseThrow(() -> new IllegalArgumentException("Participant not found"));
+ participant.setLastReadAt(LocalDateTime.now());
+ participantRepository.save(participant);
+ }
+
+ @Transactional(readOnly = true)
+ public long getUnreadMessageCount(Long userId) {
+ List participations = participantRepository.findByUserId(userId);
+ long totalUnreadCount = 0;
+ for (MessageParticipant p : participations) {
+ LocalDateTime lastRead = p.getLastReadAt() == null ? LocalDateTime.of(1970, 1, 1, 0, 0) : p.getLastReadAt();
+ // 只计算别人发送给当前用户的未读消息
+ totalUnreadCount += messageRepository.countByConversationIdAndCreatedAtAfterAndSenderIdNot(p.getConversation().getId(), lastRead, userId);
+ }
+ return totalUnreadCount;
+ }
+}
\ No newline at end of file
diff --git a/frontend_nuxt/components/HeaderComponent.vue b/frontend_nuxt/components/HeaderComponent.vue
index 56f1b8299..2e7e9e46f 100644
--- a/frontend_nuxt/components/HeaderComponent.vue
+++ b/frontend_nuxt/components/HeaderComponent.vue
@@ -6,7 +6,7 @@
-
+
@@ -75,7 +82,7 @@ import DropdownMenu from '~/components/DropdownMenu.vue'
import ToolTip from '~/components/ToolTip.vue'
import SearchDropdown from '~/components/SearchDropdown.vue'
import { authState, clearToken, loadCurrentUser } from '~/utils/auth'
-import { fetchUnreadCount, notificationState } from '~/utils/notification'
+import { useUnreadCount } from '~/composables/useUnreadCount'
import { useIsMobile } from '~/utils/screen'
import { themeState, cycleTheme, ThemeMode } from '~/utils/theme'
import { toast } from '~/main'
@@ -93,7 +100,7 @@ const props = defineProps({
const isLogin = computed(() => authState.loggedIn)
const isMobile = useIsMobile()
-const unreadCount = computed(() => notificationState.unreadCount)
+const { count: unreadMessageCount, fetchUnreadCount } = useUnreadCount()
const avatar = ref('')
const showSearch = ref(false)
const searchDropdown = ref(null)
@@ -182,15 +189,18 @@ const goToNewPost = () => {
}
const refrechData = async () => {
- await fetchUnreadCount()
window.dispatchEvent(new Event('refresh-home'))
}
+const goToMessages = () => {
+ navigateTo('/messages');
+};
+
const headerMenuItems = computed(() => [
{ text: '设置', onClick: goToSettings },
{ text: '个人主页', onClick: goToProfile },
{ text: '退出', onClick: goToLogout },
-])
+]);
/** 其余逻辑保持不变 */
const iconClass = computed(() => {
@@ -215,9 +225,8 @@ onMounted(async () => {
}
const updateUnread = async () => {
if (authState.loggedIn) {
- await fetchUnreadCount()
- } else {
- notificationState.unreadCount = 0
+ // Initialize the unread count composable
+ fetchUnreadCount();
}
}
@@ -226,7 +235,7 @@ onMounted(async () => {
watch(
() => authState.loggedIn,
- async () => {
+ async (isLoggedIn) => {
await updateAvatar()
await updateUnread()
},
@@ -379,9 +388,27 @@ onMounted(async () => {
}
.rss-icon,
-.new-post-icon {
+.new-post-icon,
+.messages-icon {
font-size: 18px;
cursor: pointer;
+ position: relative;
+}
+
+.unread-badge {
+ position: absolute;
+ top: -5px;
+ right: -10px;
+ background-color: #ff4d4f;
+ color: white;
+ border-radius: 50%;
+ padding: 2px 5px;
+ font-size: 10px;
+ font-weight: bold;
+ line-height: 1;
+ min-width: 16px;
+ text-align: center;
+ box-sizing: border-box;
}
.rss-icon {
diff --git a/frontend_nuxt/components/MessageEditor.vue b/frontend_nuxt/components/MessageEditor.vue
new file mode 100644
index 000000000..865b1c127
--- /dev/null
+++ b/frontend_nuxt/components/MessageEditor.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/frontend_nuxt/composables/useUnreadCount.js b/frontend_nuxt/composables/useUnreadCount.js
new file mode 100644
index 000000000..381b67d6a
--- /dev/null
+++ b/frontend_nuxt/composables/useUnreadCount.js
@@ -0,0 +1,93 @@
+import { ref, watch, onMounted } from 'vue';
+import { useWebSocket } from './useWebSocket';
+import { getToken } from '~/utils/auth';
+
+const count = ref(0);
+let isInitialized = false;
+let wsSubscription = null;
+
+export function useUnreadCount() {
+ const config = useRuntimeConfig();
+ const API_BASE_URL = config.public.apiBaseUrl;
+ const { subscribe, isConnected, connect } = useWebSocket();
+
+ const fetchUnreadCount = async () => {
+ const token = getToken();
+ if (!token) {
+ count.value = 0;
+ return;
+ }
+ try {
+ const response = await fetch(`${API_BASE_URL}/api/messages/unread-count`, {
+ headers: { Authorization: `Bearer ${token}` },
+ });
+ if (response.ok) {
+ const data = await response.json();
+ count.value = data;
+ }
+ } catch (error) {
+ console.error('Failed to fetch unread count:', error);
+ }
+ };
+
+ const initialize = async () => {
+ const token = getToken();
+ if (!token) {
+ count.value = 0;
+ return;
+ }
+
+ // 总是获取最新的未读数量
+ fetchUnreadCount();
+
+ // 确保WebSocket连接
+ if (!isConnected.value) {
+ connect(token);
+ }
+
+ // 设置WebSocket监听
+ await setupWebSocketListener();
+ };
+
+ const setupWebSocketListener = async () => {
+ // 只有在还没有订阅的情况下才设置监听
+ if (!wsSubscription) {
+
+ watch(isConnected, (newValue) => {
+ if (newValue && !wsSubscription) {
+ const destination = `/user/queue/unread-count`;
+ wsSubscription = subscribe(destination, (message) => {
+ const unreadCount = parseInt(message.body, 10);
+ if (!isNaN(unreadCount)) {
+ count.value = unreadCount;
+ }
+ });
+ }
+ }, { immediate: true });
+ }
+ };
+
+ // 自动初始化逻辑 - 确保每次调用都能获取到未读数量并设置监听
+ const token = getToken();
+ if (token) {
+ if (!isInitialized) {
+ isInitialized = true;
+ initialize(); // 完整初始化，包括WebSocket监听
+ } else {
+ // 即使已经初始化，也要确保获取最新的未读数量并确保WebSocket监听存在
+ fetchUnreadCount();
+
+ // 确保WebSocket连接和监听都存在
+ if (!isConnected.value) {
+ connect(token);
+ }
+ setupWebSocketListener();
+ }
+ }
+
+ return {
+ count,
+ fetchUnreadCount,
+ initialize,
+ };
+}
\ No newline at end of file
diff --git a/frontend_nuxt/composables/useWebSocket.js b/frontend_nuxt/composables/useWebSocket.js
new file mode 100644
index 000000000..389af3f1a
--- /dev/null
+++ b/frontend_nuxt/composables/useWebSocket.js
@@ -0,0 +1,85 @@
+import { ref } from 'vue';
+import { Client } from '@stomp/stompjs';
+import SockJS from 'sockjs-client/dist/sockjs.min.js';
+import { useRuntimeConfig } from '#app';
+
+const client = ref(null);
+const isConnected = ref(false);
+
+const connect = (token) => {
+ if (isConnected.value) {
+ return;
+ }
+
+ const config = useRuntimeConfig();
+ const API_BASE_URL = config.public.apiBaseUrl;
+ const socketUrl = `${API_BASE_URL}/ws`;
+
+ const socket = new SockJS(socketUrl);
+ const stompClient = new Client({
+ webSocketFactory: () => socket,
+ connectHeaders: {
+ Authorization: `Bearer ${token}`,
+ },
+ debug: function (str) {
+ },
+ reconnectDelay: 5000,
+ heartbeatIncoming: 4000,
+ heartbeatOutgoing: 4000,
+ });
+
+ stompClient.onConnect = (frame) => {
+ isConnected.value = true;
+ };
+
+ stompClient.onStompError = (frame) => {
+ console.error('WebSocket STOMP error:', frame);
+ };
+
+ stompClient.activate();
+ client.value = stompClient;
+};
+
+const disconnect = () => {
+ if (client.value) {
+ isConnected.value = false;
+ client.value.deactivate();
+ client.value = null;
+ }
+};
+
+const subscribe = (destination, callback) => {
+
+ if (!isConnected.value || !client.value || !client.value.connected) {
+ return null;
+ }
+
+ try {
+ const subscription = client.value.subscribe(destination, (message) => {
+ try {
+ if (destination.includes('/queue/unread-count')) {
+ callback(message);
+ } else {
+ const parsedMessage = JSON.parse(message.body);
+ callback(parsedMessage);
+ }
+ } catch (error) {
+ callback(message);
+ }
+ });
+
+ return subscription;
+ } catch (error) {
+ return null;
+ }
+};
+
+export function useWebSocket() {
+ return {
+ client,
+ isConnected,
+ connect,
+ disconnect,
+ subscribe,
+ };
+}
\ No newline at end of file
diff --git a/frontend_nuxt/package.json b/frontend_nuxt/package.json
index 2b6d110e9..a543255f0 100644
--- a/frontend_nuxt/package.json
+++ b/frontend_nuxt/package.json
@@ -21,6 +21,8 @@
"vue-echarts": "^7.0.3",
"vue-toastification": "^2.0.0-rc.5",
"flatpickr": "^4.6.13",
- "vue-flatpickr-component": "^12.0.0"
+ "vue-flatpickr-component": "^12.0.0",
+ "@stomp/stompjs": "^7.0.0",
+ "sockjs-client": "^1.6.1"
}
}
diff --git a/frontend_nuxt/pages/messages/[id].vue b/frontend_nuxt/pages/messages/[id].vue
new file mode 100644
index 000000000..62035b31f
--- /dev/null
+++ b/frontend_nuxt/pages/messages/[id].vue
@@ -0,0 +1,490 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/frontend_nuxt/pages/messages/index.vue b/frontend_nuxt/pages/messages/index.vue
new file mode 100644
index 000000000..085a1d96c
--- /dev/null
+++ b/frontend_nuxt/pages/messages/index.vue
@@ -0,0 +1,375 @@
+
+
+
+
+
+
+
+ {{ otherParticipant.username }}
+
+
+
+
+ 加载中...
+ {{ error }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/frontend_nuxt/pages/users/[id].vue b/frontend_nuxt/pages/users/[id].vue
index b873add16..4523565df 100644
--- a/frontend_nuxt/pages/users/[id].vue
+++ b/frontend_nuxt/pages/users/[id].vue
@@ -27,7 +27,15 @@
>
取消关注
-
+
+
+ 加载中...
+
+
+
+ {{ error }}
+
+
+
+ 暂无会话
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ {{ getOtherParticipant(convo)?.username || '未知用户' }}
+
+
+
- tag
+ 标签
diff --git a/frontend_nuxt/pages/index.vue b/frontend_nuxt/pages/index.vue
index 5dc58c900..7e2d9ac62 100644
--- a/frontend_nuxt/pages/index.vue
+++ b/frontend_nuxt/pages/index.vue
@@ -449,7 +449,7 @@ const sanitizeDescription = (text) => stripMarkdown(text)
}
.topic-item {
- padding: 10px 20px;
+ padding: 6px 20px;
cursor: pointer;
}
From f21ed1f062a78687595c9f42c575ada75e099d4c Mon Sep 17 00:00:00 2001
From: Palm Civet
Date: Fri, 22 Aug 2025 00:01:50 +0800
Subject: [PATCH 31/62] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=E6=9C=AA?=
=?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E4=BE=9D=E8=B5=96=20&&=20=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=20husky=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.husky/pre-commit | 3 --
package.json | 73 +++++++++++------------------------------------
2 files changed, 16 insertions(+), 60 deletions(-)
diff --git a/.husky/pre-commit b/.husky/pre-commit
index d24fdfc60..2312dc587 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
npx lint-staged
diff --git a/package.json b/package.json
index 8a14370ae..701c64565 100644
--- a/package.json
+++ b/package.json
@@ -1,69 +1,28 @@
{
"name": "openisle",
"version": "1.0.0",
+ "private": true,
"description": "
Date: Fri, 22 Aug 2025 11:15:45 +0800
Subject: [PATCH 32/62] =?UTF-8?q?fix:=E3=80=90=E7=AB=99=E5=86=85=E4=BF=A1?=
=?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/openisle/config/WebSocketConfig.java | 23 +-
frontend_nuxt/package-lock.json | 473 ++++++++++--------
frontend_nuxt/pages/messages/[id].vue | 4 +-
frontend_nuxt/pages/messages/index.vue | 4 +-
frontend_nuxt/utils/messageTime.js | 12 -
5 files changed, 301 insertions(+), 215 deletions(-)
delete mode 100644 frontend_nuxt/utils/messageTime.js
diff --git a/backend/src/main/java/com/openisle/config/WebSocketConfig.java b/backend/src/main/java/com/openisle/config/WebSocketConfig.java
index 309921fb9..254ead4e2 100644
--- a/backend/src/main/java/com/openisle/config/WebSocketConfig.java
+++ b/backend/src/main/java/com/openisle/config/WebSocketConfig.java
@@ -2,6 +2,7 @@ package com.openisle.config;
import com.openisle.service.JwtService;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
@@ -25,6 +26,8 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
private final JwtService jwtService;
private final UserDetailsService userDetailsService;
+ @Value("${app.website-url}")
+ private String websiteUrl;
@Override
public void configureMessageBroker(MessageBrokerRegistry config) {
@@ -39,7 +42,25 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
@Override
public void registerStompEndpoints(StompEndpointRegistry registry) {
// Registers the "/ws" endpoint, enabling SockJS fallback options so that alternate transports may be used if WebSocket is not available.
- registry.addEndpoint("/ws").setAllowedOriginPatterns("*").withSockJS();
+ registry.addEndpoint("/ws")
+ // 安全改进：使用具体的允许源，而不是通配符
+ .setAllowedOrigins(
+ "http://127.0.0.1:8080",
+ "http://127.0.0.1:3000",
+ "http://127.0.0.1:3001",
+ "http://127.0.0.1",
+ "http://localhost:8080",
+ "http://localhost:3000",
+ "http://localhost:3001",
+ "http://localhost",
+ "http://30.211.97.238:3000",
+ "http://30.211.97.238",
+ "http://192.168.7.98",
+ "http://192.168.7.98:3000",
+ websiteUrl,
+ websiteUrl.replace("://www.", "://")
+ )
+ .withSockJS();
}
@Override
diff --git a/frontend_nuxt/package-lock.json b/frontend_nuxt/package-lock.json
index fadb31ec0..e5f1cd8d8 100644
--- a/frontend_nuxt/package-lock.json
+++ b/frontend_nuxt/package-lock.json
@@ -6,6 +6,7 @@
"": {
"name": "frontend_nuxt",
"dependencies": {
+ "@stomp/stompjs": "^7.0.0",
"cropperjs": "^1.6.2",
"echarts": "^5.6.0",
"flatpickr": "^4.6.13",
@@ -14,6 +15,7 @@
"markdown-it": "^14.1.0",
"nprogress": "^0.2.0",
"nuxt": "latest",
+ "sockjs-client": "^1.6.1",
"vditor": "^3.11.1",
"vue-easy-lightbox": "^1.19.0",
"vue-echarts": "^7.0.3",
@@ -957,9 +959,9 @@
}
},
"node_modules/@fastify/busboy": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-3.1.1.tgz",
- "integrity": "sha512-5DGmA8FTdB2XbDeEwc/5ZXBl6UbBAyBOOLlPuBnZ/N1SwdH9Ii+cOX3tBROlDgcTXxjOYnLMVoKk9+FXAw0CJw==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-3.2.0.tgz",
+ "integrity": "sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==",
"license": "MIT"
},
"node_modules/@ioredis/commands": {
@@ -1007,6 +1009,16 @@
"@jridgewell/trace-mapping": "^0.3.24"
}
},
+ "node_modules/@jridgewell/remapping": {
+ "version": "2.3.5",
+ "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+ "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@jridgewell/gen-mapping": "^0.3.5",
+ "@jridgewell/trace-mapping": "^0.3.24"
+ }
+ },
"node_modules/@jridgewell/resolve-uri": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
@@ -1663,9 +1675,9 @@
}
},
"node_modules/@netlify/zip-it-and-ship-it/node_modules/@netlify/serverless-functions-api": {
- "version": "2.1.3",
- "resolved": "https://registry.npmjs.org/@netlify/serverless-functions-api/-/serverless-functions-api-2.1.3.tgz",
- "integrity": "sha512-bNlN/hpND8xFQzpjyKxm6vJayD+bPBlOvs4lWihE7WULrphuH1UuFsoVE5386bNNGH8Rs1IH01AFsl7ALQgOlQ==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@netlify/serverless-functions-api/-/serverless-functions-api-2.2.0.tgz",
+ "integrity": "sha512-eQNnGUMyatgEeFJ8iKI2DT7wXDEjbWmZ+hJpCZtfg1bVsD4JdprIhLqdrUqmrDgPG2r45sQYigO9oq8BWXO37w==",
"license": "MIT",
"engines": {
"node": ">=18.0.0"
@@ -3410,9 +3422,9 @@
"license": "MIT"
},
"node_modules/@rollup/rollup-android-arm-eabi": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.46.2.tgz",
- "integrity": "sha512-Zj3Hl6sN34xJtMv7Anwb5Gu01yujyE/cLBDB2gnHTAHaWS1Z38L7kuSG+oAh0giZMqG060f/YBStXtMH6FvPMA==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.46.3.tgz",
+ "integrity": "sha512-UmTdvXnLlqQNOCJnyksjPs1G4GqXNGW1LrzCe8+8QoaLhhDeTXYBgJ3k6x61WIhlHX2U+VzEJ55TtIjR/HTySA==",
"cpu": [
"arm"
],
@@ -3423,9 +3435,9 @@
]
},
"node_modules/@rollup/rollup-android-arm64": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.46.2.tgz",
- "integrity": "sha512-nTeCWY83kN64oQ5MGz3CgtPx8NSOhC5lWtsjTs+8JAJNLcP3QbLCtDDgUKQc/Ro/frpMq4SHUaHN6AMltcEoLQ==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.46.3.tgz",
+ "integrity": "sha512-8NoxqLpXm7VyeI0ocidh335D6OKT0UJ6fHdnIxf3+6oOerZZc+O7r+UhvROji6OspyPm+rrIdb1gTXtVIqn+Sg==",
"cpu": [
"arm64"
],
@@ -3436,9 +3448,9 @@
]
},
"node_modules/@rollup/rollup-darwin-arm64": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.46.2.tgz",
- "integrity": "sha512-HV7bW2Fb/F5KPdM/9bApunQh68YVDU8sO8BvcW9OngQVN3HHHkw99wFupuUJfGR9pYLLAjcAOA6iO+evsbBaPQ==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.46.3.tgz",
+ "integrity": "sha512-csnNavqZVs1+7/hUKtgjMECsNG2cdB8F7XBHP6FfQjqhjF8rzMzb3SLyy/1BG7YSfQ+bG75Ph7DyedbUqwq1rA==",
"cpu": [
"arm64"
],
@@ -3449,9 +3461,9 @@
]
},
"node_modules/@rollup/rollup-darwin-x64": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.46.2.tgz",
- "integrity": "sha512-SSj8TlYV5nJixSsm/y3QXfhspSiLYP11zpfwp6G/YDXctf3Xkdnk4woJIF5VQe0of2OjzTt8EsxnJDCdHd2xMA==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.46.3.tgz",
+ "integrity": "sha512-r2MXNjbuYabSIX5yQqnT8SGSQ26XQc8fmp6UhlYJd95PZJkQD1u82fWP7HqvGUf33IsOC6qsiV+vcuD4SDP6iw==",
"cpu": [
"x64"
],
@@ -3462,9 +3474,9 @@
]
},
"node_modules/@rollup/rollup-freebsd-arm64": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.46.2.tgz",
- "integrity": "sha512-ZyrsG4TIT9xnOlLsSSi9w/X29tCbK1yegE49RYm3tu3wF1L/B6LVMqnEWyDB26d9Ecx9zrmXCiPmIabVuLmNSg==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.46.3.tgz",
+ "integrity": "sha512-uluObTmgPJDuJh9xqxyr7MV61Imq+0IvVsAlWyvxAaBSNzCcmZlhfYcRhCdMaCsy46ccZa7vtDDripgs9Jkqsw==",
"cpu": [
"arm64"
],
@@ -3475,9 +3487,9 @@
]
},
"node_modules/@rollup/rollup-freebsd-x64": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.46.2.tgz",
- "integrity": "sha512-pCgHFoOECwVCJ5GFq8+gR8SBKnMO+xe5UEqbemxBpCKYQddRQMgomv1104RnLSg7nNvgKy05sLsY51+OVRyiVw==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.46.3.tgz",
+ "integrity": "sha512-AVJXEq9RVHQnejdbFvh1eWEoobohUYN3nqJIPI4mNTMpsyYN01VvcAClxflyk2HIxvLpRcRggpX1m9hkXkpC/A==",
"cpu": [
"x64"
],
@@ -3488,9 +3500,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.46.2.tgz",
- "integrity": "sha512-EtP8aquZ0xQg0ETFcxUbU71MZlHaw9MChwrQzatiE8U/bvi5uv/oChExXC4mWhjiqK7azGJBqU0tt5H123SzVA==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.46.3.tgz",
+ "integrity": "sha512-byyflM+huiwHlKi7VHLAYTKr67X199+V+mt1iRgJenAI594vcmGGddWlu6eHujmcdl6TqSNnvqaXJqZdnEWRGA==",
"cpu": [
"arm"
],
@@ -3501,9 +3513,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-musleabihf": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.46.2.tgz",
- "integrity": "sha512-qO7F7U3u1nfxYRPM8HqFtLd+raev2K137dsV08q/LRKRLEc7RsiDWihUnrINdsWQxPR9jqZ8DIIZ1zJJAm5PjQ==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.46.3.tgz",
+ "integrity": "sha512-aLm3NMIjr4Y9LklrH5cu7yybBqoVCdr4Nvnm8WB7PKCn34fMCGypVNpGK0JQWdPAzR/FnoEoFtlRqZbBBLhVoQ==",
"cpu": [
"arm"
],
@@ -3514,9 +3526,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-gnu": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.46.2.tgz",
- "integrity": "sha512-3dRaqLfcOXYsfvw5xMrxAk9Lb1f395gkoBYzSFcc/scgRFptRXL9DOaDpMiehf9CO8ZDRJW2z45b6fpU5nwjng==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.46.3.tgz",
+ "integrity": "sha512-VtilE6eznJRDIoFOzaagQodUksTEfLIsvXymS+UdJiSXrPW7Ai+WG4uapAc3F7Hgs791TwdGh4xyOzbuzIZrnw==",
"cpu": [
"arm64"
],
@@ -3527,9 +3539,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-musl": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.46.2.tgz",
- "integrity": "sha512-fhHFTutA7SM+IrR6lIfiHskxmpmPTJUXpWIsBXpeEwNgZzZZSg/q4i6FU4J8qOGyJ0TR+wXBwx/L7Ho9z0+uDg==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.46.3.tgz",
+ "integrity": "sha512-dG3JuS6+cRAL0GQ925Vppafi0qwZnkHdPeuZIxIPXqkCLP02l7ka+OCyBoDEv8S+nKHxfjvjW4OZ7hTdHkx8/w==",
"cpu": [
"arm64"
],
@@ -3540,9 +3552,9 @@
]
},
"node_modules/@rollup/rollup-linux-loongarch64-gnu": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.46.2.tgz",
- "integrity": "sha512-i7wfGFXu8x4+FRqPymzjD+Hyav8l95UIZ773j7J7zRYc3Xsxy2wIn4x+llpunexXe6laaO72iEjeeGyUFmjKeA==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.46.3.tgz",
+ "integrity": "sha512-iU8DxnxEKJptf8Vcx4XvAUdpkZfaz0KWfRrnIRrOndL0SvzEte+MTM7nDH4A2Now4FvTZ01yFAgj6TX/mZl8hQ==",
"cpu": [
"loong64"
],
@@ -3553,9 +3565,9 @@
]
},
"node_modules/@rollup/rollup-linux-ppc64-gnu": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.46.2.tgz",
- "integrity": "sha512-B/l0dFcHVUnqcGZWKcWBSV2PF01YUt0Rvlurci5P+neqY/yMKchGU8ullZvIv5e8Y1C6wOn+U03mrDylP5q9Yw==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.46.3.tgz",
+ "integrity": "sha512-VrQZp9tkk0yozJoQvQcqlWiqaPnLM6uY1qPYXvukKePb0fqaiQtOdMJSxNFUZFsGw5oA5vvVokjHrx8a9Qsz2A==",
"cpu": [
"ppc64"
],
@@ -3566,9 +3578,9 @@
]
},
"node_modules/@rollup/rollup-linux-riscv64-gnu": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.46.2.tgz",
- "integrity": "sha512-32k4ENb5ygtkMwPMucAb8MtV8olkPT03oiTxJbgkJa7lJ7dZMr0GCFJlyvy+K8iq7F/iuOr41ZdUHaOiqyR3iQ==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.46.3.tgz",
+ "integrity": "sha512-uf2eucWSUb+M7b0poZ/08LsbcRgaDYL8NCGjUeFMwCWFwOuFcZ8D9ayPl25P3pl+D2FH45EbHdfyUesQ2Lt9wA==",
"cpu": [
"riscv64"
],
@@ -3579,9 +3591,9 @@
]
},
"node_modules/@rollup/rollup-linux-riscv64-musl": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.46.2.tgz",
- "integrity": "sha512-t5B2loThlFEauloaQkZg9gxV05BYeITLvLkWOkRXogP4qHXLkWSbSHKM9S6H1schf/0YGP/qNKtiISlxvfmmZw==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.46.3.tgz",
+ "integrity": "sha512-7tnUcDvN8DHm/9ra+/nF7lLzYHDeODKKKrh6JmZejbh1FnCNZS8zMkZY5J4sEipy2OW1d1Ncc4gNHUd0DLqkSg==",
"cpu": [
"riscv64"
],
@@ -3592,9 +3604,9 @@
]
},
"node_modules/@rollup/rollup-linux-s390x-gnu": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.46.2.tgz",
- "integrity": "sha512-YKjekwTEKgbB7n17gmODSmJVUIvj8CX7q5442/CK80L8nqOUbMtf8b01QkG3jOqyr1rotrAnW6B/qiHwfcuWQA==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.46.3.tgz",
+ "integrity": "sha512-MUpAOallJim8CsJK+4Lc9tQzlfPbHxWDrGXZm2z6biaadNpvh3a5ewcdat478W+tXDoUiHwErX/dOql7ETcLqg==",
"cpu": [
"s390x"
],
@@ -3605,9 +3617,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-gnu": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.46.2.tgz",
- "integrity": "sha512-Jj5a9RUoe5ra+MEyERkDKLwTXVu6s3aACP51nkfnK9wJTraCC8IMe3snOfALkrjTYd2G1ViE1hICj0fZ7ALBPA==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.46.3.tgz",
+ "integrity": "sha512-F42IgZI4JicE2vM2PWCe0N5mR5vR0gIdORPqhGQ32/u1S1v3kLtbZ0C/mi9FFk7C5T0PgdeyWEPajPjaUpyoKg==",
"cpu": [
"x64"
],
@@ -3618,9 +3630,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-musl": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.46.2.tgz",
- "integrity": "sha512-7kX69DIrBeD7yNp4A5b81izs8BqoZkCIaxQaOpumcJ1S/kmqNFjPhDu1LHeVXv0SexfHQv5cqHsxLOjETuqDuA==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.46.3.tgz",
+ "integrity": "sha512-oLc+JrwwvbimJUInzx56Q3ujL3Kkhxehg7O1gWAYzm8hImCd5ld1F2Gry5YDjR21MNb5WCKhC9hXgU7rRlyegQ==",
"cpu": [
"x64"
],
@@ -3631,9 +3643,9 @@
]
},
"node_modules/@rollup/rollup-win32-arm64-msvc": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.46.2.tgz",
- "integrity": "sha512-wiJWMIpeaak/jsbaq2HMh/rzZxHVW1rU6coyeNNpMwk5isiPjSTx0a4YLSlYDwBH/WBvLz+EtsNqQScZTLJy3g==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.46.3.tgz",
+ "integrity": "sha512-lOrQ+BVRstruD1fkWg9yjmumhowR0oLAAzavB7yFSaGltY8klttmZtCLvOXCmGE9mLIn8IBV/IFrQOWz5xbFPg==",
"cpu": [
"arm64"
],
@@ -3644,9 +3656,9 @@
]
},
"node_modules/@rollup/rollup-win32-ia32-msvc": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.46.2.tgz",
- "integrity": "sha512-gBgaUDESVzMgWZhcyjfs9QFK16D8K6QZpwAaVNJxYDLHWayOta4ZMjGm/vsAEy3hvlS2GosVFlBlP9/Wb85DqQ==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.46.3.tgz",
+ "integrity": "sha512-vvrVKPRS4GduGR7VMH8EylCBqsDcw6U+/0nPDuIjXQRbHJc6xOBj+frx8ksfZAh6+Fptw5wHrN7etlMmQnPQVg==",
"cpu": [
"ia32"
],
@@ -3657,9 +3669,9 @@
]
},
"node_modules/@rollup/rollup-win32-x64-msvc": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.46.2.tgz",
- "integrity": "sha512-CvUo2ixeIQGtF6WvuB87XWqPQkoFAFqW+HUo/WzHwuHDvIwZCtjdWXoYCcr06iKGydiqTclC4jU/TNObC/xKZg==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.46.3.tgz",
+ "integrity": "sha512-fi3cPxCnu3ZeM3EwKZPgXbWoGzm2XHgB/WShKI81uj8wG0+laobmqy5wbgEwzstlbLu4MyO8C19FyhhWseYKNQ==",
"cpu": [
"x64"
],
@@ -3699,6 +3711,12 @@
"integrity": "sha512-0dxmVj4gxg3Jg879kvFS/msl4s9F3T9UXC1InxgOf7t5NvcPD97u/WTA5vL/IxWHMn7qSxBozqrnnE2wvl1m8g==",
"license": "CC0-1.0"
},
+ "node_modules/@stomp/stompjs": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/@stomp/stompjs/-/stompjs-7.1.1.tgz",
+ "integrity": "sha512-chcDs6YkAnKp1FqzwhGvh3i7v0+/ytzqWdKYw6XzINEKAzke/iD00dNgFPWSZEqktHOK+C1gSzXhLkLbARIaZw==",
+ "license": "Apache-2.0"
+ },
"node_modules/@tybys/wasm-util": {
"version": "0.10.0",
"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.0.tgz",
@@ -3723,9 +3741,9 @@
"license": "MIT"
},
"node_modules/@types/node": {
- "version": "24.2.1",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.1.tgz",
- "integrity": "sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ==",
+ "version": "24.3.0",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz",
+ "integrity": "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==",
"license": "MIT",
"optional": true,
"dependencies": {
@@ -3767,13 +3785,13 @@
}
},
"node_modules/@typescript-eslint/project-service": {
- "version": "8.39.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.39.1.tgz",
- "integrity": "sha512-8fZxek3ONTwBu9ptw5nCKqZOSkXshZB7uAxuFF0J/wTMkKydjXCzqqga7MlFMpHi9DoG4BadhmTkITBcg8Aybw==",
+ "version": "8.40.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.40.0.tgz",
+ "integrity": "sha512-/A89vz7Wf5DEXsGVvcGdYKbVM9F7DyFXj52lNYUDS1L9yJfqjW/fIp5PgMuEJL/KeqVTe2QSbXAGUZljDUpArw==",
"license": "MIT",
"dependencies": {
- "@typescript-eslint/tsconfig-utils": "^8.39.1",
- "@typescript-eslint/types": "^8.39.1",
+ "@typescript-eslint/tsconfig-utils": "^8.40.0",
+ "@typescript-eslint/types": "^8.40.0",
"debug": "^4.3.4"
},
"engines": {
@@ -3788,9 +3806,9 @@
}
},
"node_modules/@typescript-eslint/tsconfig-utils": {
- "version": "8.39.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.39.1.tgz",
- "integrity": "sha512-ePUPGVtTMR8XMU2Hee8kD0Pu4NDE1CN9Q1sxGSGd/mbOtGZDM7pnhXNJnzW63zk/q+Z54zVzj44HtwXln5CvHA==",
+ "version": "8.40.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.40.0.tgz",
+ "integrity": "sha512-jtMytmUaG9d/9kqSl/W3E3xaWESo4hFDxAIHGVW/WKKtQhesnRIJSAJO6XckluuJ6KDB5woD1EiqknriCtAmcw==",
"license": "MIT",
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3804,9 +3822,9 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "8.39.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.39.1.tgz",
- "integrity": "sha512-7sPDKQQp+S11laqTrhHqeAbsCfMkwJMrV7oTDvtDds4mEofJYir414bYKUEb8YPUm9QL3U+8f6L6YExSoAGdQw==",
+ "version": "8.40.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.40.0.tgz",
+ "integrity": "sha512-ETdbFlgbAmXHyFPwqUIYrfc12ArvpBhEVgGAxVYSwli26dn8Ko+lIo4Su9vI9ykTZdJn+vJprs/0eZU0YMAEQg==",
"license": "MIT",
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3817,15 +3835,15 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "8.39.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.39.1.tgz",
- "integrity": "sha512-EKkpcPuIux48dddVDXyQBlKdeTPMmALqBUbEk38McWv0qVEZwOpVJBi7ugK5qVNgeuYjGNQxrrnoM/5+TI/BPw==",
+ "version": "8.40.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.40.0.tgz",
+ "integrity": "sha512-k1z9+GJReVVOkc1WfVKs1vBrR5MIKKbdAjDTPvIK3L8De6KbFfPFt6BKpdkdk7rZS2GtC/m6yI5MYX+UsuvVYQ==",
"license": "MIT",
"dependencies": {
- "@typescript-eslint/project-service": "8.39.1",
- "@typescript-eslint/tsconfig-utils": "8.39.1",
- "@typescript-eslint/types": "8.39.1",
- "@typescript-eslint/visitor-keys": "8.39.1",
+ "@typescript-eslint/project-service": "8.40.0",
+ "@typescript-eslint/tsconfig-utils": "8.40.0",
+ "@typescript-eslint/types": "8.40.0",
+ "@typescript-eslint/visitor-keys": "8.40.0",
"debug": "^4.3.4",
"fast-glob": "^3.3.2",
"is-glob": "^4.0.3",
@@ -3845,12 +3863,12 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "8.39.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.39.1.tgz",
- "integrity": "sha512-W8FQi6kEh2e8zVhQ0eeRnxdvIoOkAp/CPAahcNio6nO9dsIwb9b34z90KOlheoyuVf6LSOEdjlkxSkapNEc+4A==",
+ "version": "8.40.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.40.0.tgz",
+ "integrity": "sha512-8CZ47QwalyRjsypfwnbI3hKy5gJDPmrkLjkgMxhi0+DZZ2QNx2naS6/hWoVYUHU7LU2zleF68V9miaVZvhFfTA==",
"license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "8.39.1",
+ "@typescript-eslint/types": "8.40.0",
"eslint-visitor-keys": "^4.2.1"
},
"engines": {
@@ -4379,15 +4397,15 @@
}
},
"node_modules/alien-signals": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-2.0.6.tgz",
- "integrity": "sha512-P3TxJSe31bUHBiblg59oU1PpaWPtmxF9GhJ/cB7OkgJ0qN/ifFSKUI25/v8ZhsT+lIG6ac8DpTOplXxORX6F3Q==",
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-2.0.7.tgz",
+ "integrity": "sha512-wE7y3jmYeb0+h6mr5BOovuqhFv22O/MV9j5p0ndJsa7z1zJNPGQ4ph5pQk/kTTCWRC3xsA4SmtwmkzQO+7NCNg==",
"license": "MIT"
},
"node_modules/ansi-regex": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
- "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz",
+ "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==",
"license": "MIT",
"engines": {
"node": ">=12"
@@ -4522,13 +4540,13 @@
}
},
"node_modules/ast-walker-scope": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/ast-walker-scope/-/ast-walker-scope-0.8.1.tgz",
- "integrity": "sha512-72XOdbzQCMKERvFrxAykatn2pu7osPNq/sNUzwcHdWzwPvOsNpPqkawfDXVvQbA2RT+ivtsMNjYdojTUZitt1A==",
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/ast-walker-scope/-/ast-walker-scope-0.8.2.tgz",
+ "integrity": "sha512-3pYeLyDZ6nJew9QeBhS4Nly02269Dkdk32+zdbbKmL6n4ZuaGorwwA+xx12xgOciA8BF1w9x+dlH7oUkFTW91w==",
"license": "MIT",
"dependencies": {
- "@babel/parser": "^7.27.2",
- "ast-kit": "^2.0.0"
+ "@babel/parser": "^7.28.3",
+ "ast-kit": "^2.1.2"
},
"engines": {
"node": ">=20.18.0"
@@ -4671,9 +4689,9 @@
}
},
"node_modules/browserslist": {
- "version": "4.25.2",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz",
- "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==",
+ "version": "4.25.3",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.3.tgz",
+ "integrity": "sha512-cDGv1kkDI4/0e5yON9yM5G/0A5u8sf5TnmdX5C9qHzI9PPu++sQ9zjm1k9NiOrf3riY4OkK0zSGqfvJyJsgCBQ==",
"funding": [
{
"type": "opencollective",
@@ -4690,8 +4708,8 @@
],
"license": "MIT",
"dependencies": {
- "caniuse-lite": "^1.0.30001733",
- "electron-to-chromium": "^1.5.199",
+ "caniuse-lite": "^1.0.30001735",
+ "electron-to-chromium": "^1.5.204",
"node-releases": "^2.0.19",
"update-browserslist-db": "^1.1.3"
},
@@ -5946,9 +5964,9 @@
"license": "MIT"
},
"node_modules/electron-to-chromium": {
- "version": "1.5.202",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.202.tgz",
- "integrity": "sha512-NxbYjRmiHcHXV1Ws3fWUW+SLb62isauajk45LUJ/HgIOkUA7jLZu/X2Iif+X9FBNK8QkF9Zb4Q2mcwXCcY30mg==",
+ "version": "1.5.206",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.206.tgz",
+ "integrity": "sha512-/eucXSTaI8L78l42xPurxdBzPTjAkMVCQO7unZCWk9LnZiwKcSvQUhF4c99NWQLwMQXxjlfoQy0+8m9U2yEDQQ==",
"license": "ISC"
},
"node_modules/emoji-regex": {
@@ -6234,6 +6252,15 @@
"node": ">=0.8.x"
}
},
+ "node_modules/eventsource": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz",
+ "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
"node_modules/execa": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
@@ -6338,6 +6365,18 @@
"reusify": "^1.0.4"
}
},
+ "node_modules/faye-websocket": {
+ "version": "0.11.4",
+ "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+ "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "websocket-driver": ">=0.5.1"
+ },
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
"node_modules/fd-slicer": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
@@ -6909,6 +6948,12 @@
"node": ">= 0.8"
}
},
+ "node_modules/http-parser-js": {
+ "version": "0.5.10",
+ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz",
+ "integrity": "sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==",
+ "license": "MIT"
+ },
"node_modules/http-shutdown": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/http-shutdown/-/http-shutdown-1.2.2.tgz",
@@ -9574,9 +9619,9 @@
}
},
"node_modules/quansync": {
- "version": "0.2.10",
- "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.10.tgz",
- "integrity": "sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==",
+ "version": "0.2.11",
+ "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.11.tgz",
+ "integrity": "sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==",
"funding": [
{
"type": "individual",
@@ -9589,6 +9634,12 @@
],
"license": "MIT"
},
+ "node_modules/querystringify": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+ "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+ "license": "MIT"
+ },
"node_modules/queue-microtask": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -9786,6 +9837,12 @@
"integrity": "sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q==",
"license": "MIT"
},
+ "node_modules/requires-port": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+ "license": "MIT"
+ },
"node_modules/resolve": {
"version": "2.0.0-next.5",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
@@ -9829,9 +9886,9 @@
"license": "MIT"
},
"node_modules/rollup": {
- "version": "4.46.2",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.46.2.tgz",
- "integrity": "sha512-WMmLFI+Boh6xbop+OAGo9cQ3OgX9MIg7xOQjn+pTCwOkk+FNDAeAemXkJ3HzDJrVXleLOFVa1ipuc1AmEx1Dwg==",
+ "version": "4.46.3",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.46.3.tgz",
+ "integrity": "sha512-RZn2XTjXb8t5g13f5YclGoilU/kwT696DIkY3sywjdZidNSi3+vseaQov7D7BZXVJCPv3pDWUN69C78GGbXsKw==",
"license": "MIT",
"dependencies": {
"@types/estree": "1.0.8"
@@ -9844,26 +9901,26 @@
"npm": ">=8.0.0"
},
"optionalDependencies": {
- "@rollup/rollup-android-arm-eabi": "4.46.2",
- "@rollup/rollup-android-arm64": "4.46.2",
- "@rollup/rollup-darwin-arm64": "4.46.2",
- "@rollup/rollup-darwin-x64": "4.46.2",
- "@rollup/rollup-freebsd-arm64": "4.46.2",
- "@rollup/rollup-freebsd-x64": "4.46.2",
- "@rollup/rollup-linux-arm-gnueabihf": "4.46.2",
- "@rollup/rollup-linux-arm-musleabihf": "4.46.2",
- "@rollup/rollup-linux-arm64-gnu": "4.46.2",
- "@rollup/rollup-linux-arm64-musl": "4.46.2",
- "@rollup/rollup-linux-loongarch64-gnu": "4.46.2",
- "@rollup/rollup-linux-ppc64-gnu": "4.46.2",
- "@rollup/rollup-linux-riscv64-gnu": "4.46.2",
- "@rollup/rollup-linux-riscv64-musl": "4.46.2",
- "@rollup/rollup-linux-s390x-gnu": "4.46.2",
- "@rollup/rollup-linux-x64-gnu": "4.46.2",
- "@rollup/rollup-linux-x64-musl": "4.46.2",
- "@rollup/rollup-win32-arm64-msvc": "4.46.2",
- "@rollup/rollup-win32-ia32-msvc": "4.46.2",
- "@rollup/rollup-win32-x64-msvc": "4.46.2",
+ "@rollup/rollup-android-arm-eabi": "4.46.3",
+ "@rollup/rollup-android-arm64": "4.46.3",
+ "@rollup/rollup-darwin-arm64": "4.46.3",
+ "@rollup/rollup-darwin-x64": "4.46.3",
+ "@rollup/rollup-freebsd-arm64": "4.46.3",
+ "@rollup/rollup-freebsd-x64": "4.46.3",
+ "@rollup/rollup-linux-arm-gnueabihf": "4.46.3",
+ "@rollup/rollup-linux-arm-musleabihf": "4.46.3",
+ "@rollup/rollup-linux-arm64-gnu": "4.46.3",
+ "@rollup/rollup-linux-arm64-musl": "4.46.3",
+ "@rollup/rollup-linux-loongarch64-gnu": "4.46.3",
+ "@rollup/rollup-linux-ppc64-gnu": "4.46.3",
+ "@rollup/rollup-linux-riscv64-gnu": "4.46.3",
+ "@rollup/rollup-linux-riscv64-musl": "4.46.3",
+ "@rollup/rollup-linux-s390x-gnu": "4.46.3",
+ "@rollup/rollup-linux-x64-gnu": "4.46.3",
+ "@rollup/rollup-linux-x64-musl": "4.46.3",
+ "@rollup/rollup-win32-arm64-msvc": "4.46.3",
+ "@rollup/rollup-win32-ia32-msvc": "4.46.3",
+ "@rollup/rollup-win32-x64-msvc": "4.46.3",
"fsevents": "~2.3.2"
}
},
@@ -10225,6 +10282,34 @@
"integrity": "sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==",
"license": "MIT"
},
+ "node_modules/sockjs-client": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.1.tgz",
+ "integrity": "sha512-2g0tjOR+fRs0amxENLi/q5TiJTqY+WXFOzb5UwXndlK6TO3U/mirZznpx6w34HVMoc3g7cY24yC/ZMIYnDlfkw==",
+ "license": "MIT",
+ "dependencies": {
+ "debug": "^3.2.7",
+ "eventsource": "^2.0.2",
+ "faye-websocket": "^0.11.4",
+ "inherits": "^2.0.4",
+ "url-parse": "^1.5.10"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://tidelift.com/funding/github/npm/sockjs-client"
+ }
+ },
+ "node_modules/sockjs-client/node_modules/debug": {
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+ "license": "MIT",
+ "dependencies": {
+ "ms": "^2.1.1"
+ }
+ },
"node_modules/source-map": {
"version": "0.7.6",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz",
@@ -10516,9 +10601,9 @@
}
},
"node_modules/supports-color": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-10.1.0.tgz",
- "integrity": "sha512-GBuewsPrhJPftT+fqDa9oI/zc5HNsG9nREqwzoSFDOIqf0NggOZbHQj2TE1P1CDJK8ZogFnlZY9hWoUiur7I/A==",
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-10.2.0.tgz",
+ "integrity": "sha512-5eG9FQjEjDbAlI5+kdpdyPIBMRH4GfTVDGREVupaZHmVoppknhM29b/S9BkQz7cathp85BVgRi/As3Siln7e0Q==",
"license": "MIT",
"engines": {
"node": ">=18"
@@ -10937,13 +11022,14 @@
}
},
"node_modules/unplugin": {
- "version": "2.3.5",
- "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-2.3.5.tgz",
- "integrity": "sha512-RyWSb5AHmGtjjNQ6gIlA67sHOsWpsbWpwDokLwTcejVdOjEkJZh7QKu14J00gDDVSh8kGH4KYC/TNBceXFZhtw==",
+ "version": "2.3.6",
+ "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-2.3.6.tgz",
+ "integrity": "sha512-+/MdXl8bLTXI2lJF22gUBeCFqZruEpL/oM9f8wxCuKh9+Mw9qeul3gTqgbKpMeOFlusCzc0s7x2Kax2xKW+FQg==",
"license": "MIT",
"dependencies": {
- "acorn": "^8.14.1",
- "picomatch": "^4.0.2",
+ "@jridgewell/remapping": "^2.3.5",
+ "acorn": "^8.15.0",
+ "picomatch": "^4.0.3",
"webpack-virtual-modules": "^0.6.2"
},
"engines": {
@@ -11134,59 +11220,17 @@
}
},
"node_modules/unwasm": {
- "version": "0.3.9",
- "resolved": "https://registry.npmjs.org/unwasm/-/unwasm-0.3.9.tgz",
- "integrity": "sha512-LDxTx/2DkFURUd+BU1vUsF/moj0JsoTvl+2tcg2AUOiEzVturhGGx17/IMgGvKUYdZwr33EJHtChCJuhu9Ouvg==",
+ "version": "0.3.11",
+ "resolved": "https://registry.npmjs.org/unwasm/-/unwasm-0.3.11.tgz",
+ "integrity": "sha512-Vhp5gb1tusSQw5of/g3Q697srYgMXvwMgXMjcG4ZNga02fDX9coxJ9fAb0Ci38hM2Hv/U1FXRPGgjP2BYqhNoQ==",
"license": "MIT",
"dependencies": {
- "knitwork": "^1.0.0",
- "magic-string": "^0.30.8",
- "mlly": "^1.6.1",
- "pathe": "^1.1.2",
- "pkg-types": "^1.0.3",
- "unplugin": "^1.10.0"
- }
- },
- "node_modules/unwasm/node_modules/confbox": {
- "version": "0.1.8",
- "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
- "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
- "license": "MIT"
- },
- "node_modules/unwasm/node_modules/pathe": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
- "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
- "license": "MIT"
- },
- "node_modules/unwasm/node_modules/pkg-types": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz",
- "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
- "license": "MIT",
- "dependencies": {
- "confbox": "^0.1.8",
+ "knitwork": "^1.2.0",
+ "magic-string": "^0.30.17",
"mlly": "^1.7.4",
- "pathe": "^2.0.1"
- }
- },
- "node_modules/unwasm/node_modules/pkg-types/node_modules/pathe": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
- "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
- "license": "MIT"
- },
- "node_modules/unwasm/node_modules/unplugin": {
- "version": "1.16.1",
- "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.16.1.tgz",
- "integrity": "sha512-4/u/j4FrCKdi17jaxuJA0jClGxB1AvU2hw/IuayPc4ay1XGaJs/rbb4v5WKwAjNifjmXK9PIFyuPiaK8azyR9w==",
- "license": "MIT",
- "dependencies": {
- "acorn": "^8.14.0",
- "webpack-virtual-modules": "^0.6.2"
- },
- "engines": {
- "node": ">=14.0.0"
+ "pathe": "^2.0.3",
+ "pkg-types": "^2.2.0",
+ "unplugin": "^2.3.6"
}
},
"node_modules/update-browserslist-db": {
@@ -11225,6 +11269,16 @@
"integrity": "sha512-MJu7ypHq6QasgF5YRTjqscSzQp/W11zoUk6kvmlH+fmWEs63Y0Eib13hYFwAzagRJcVY8WVnlV+eBDUGMJ5IbA==",
"license": "MIT"
},
+ "node_modules/url-parse": {
+ "version": "1.5.10",
+ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+ "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+ "license": "MIT",
+ "dependencies": {
+ "querystringify": "^2.1.1",
+ "requires-port": "^1.0.0"
+ }
+ },
"node_modules/urlpattern-polyfill": {
"version": "8.0.2",
"resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-8.0.2.tgz",
@@ -11273,13 +11327,13 @@
}
},
"node_modules/vite": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.2.tgz",
- "integrity": "sha512-J0SQBPlQiEXAF7tajiH+rUooJPo0l8KQgyg4/aMunNtrOa7bwuZJsJbDWzeljqQpgftxuq5yNJxQ91O9ts29UQ==",
+ "version": "7.1.3",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.3.tgz",
+ "integrity": "sha512-OOUi5zjkDxYrKhTV3V7iKsoS37VUM7v40+HuwEmcrsf11Cdx9y3DIr2Px6liIcZFwt3XSRpQvFpL3WVy7ApkGw==",
"license": "MIT",
"dependencies": {
"esbuild": "^0.25.0",
- "fdir": "^6.4.6",
+ "fdir": "^6.5.0",
"picomatch": "^4.0.3",
"postcss": "^8.5.6",
"rollup": "^4.43.0",
@@ -11737,6 +11791,29 @@
"integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==",
"license": "MIT"
},
+ "node_modules/websocket-driver": {
+ "version": "0.7.4",
+ "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+ "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "http-parser-js": ">=0.5.1",
+ "safe-buffer": ">=5.1.0",
+ "websocket-extensions": ">=0.1.1"
+ },
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/websocket-extensions": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+ "license": "Apache-2.0",
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
"node_modules/whatwg-url": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
diff --git a/frontend_nuxt/pages/messages/[id].vue b/frontend_nuxt/pages/messages/[id].vue
index 62035b31f..f9ef6d074 100644
--- a/frontend_nuxt/pages/messages/[id].vue
+++ b/frontend_nuxt/pages/messages/[id].vue
@@ -34,7 +34,7 @@
![\"OpenIsle\"](\"https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/image.png\")
高效的开源社区前后端端平台
![](\"https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square\"){kind=icon}
+
+
+
+
+
+
diff --git a/frontend_nuxt/pages/messages/index.vue b/frontend_nuxt/pages/message-box/index.vue
similarity index 66%
rename from frontend_nuxt/pages/messages/index.vue
rename to frontend_nuxt/pages/message-box/index.vue
index cd44a2055..6bb4958ee 100644
--- a/frontend_nuxt/pages/messages/index.vue
+++ b/frontend_nuxt/pages/message-box/index.vue
@@ -1,21 +1,17 @@
+
+
+
+
+
+
+
+
+ {{ otherParticipant.username }}
+
-
-
-
-
-
-
\ No newline at end of file
diff --git a/frontend_nuxt/pages/users/[id].vue b/frontend_nuxt/pages/users/[id].vue
index 4523565df..8ac524306 100644
--- a/frontend_nuxt/pages/users/[id].vue
+++ b/frontend_nuxt/pages/users/[id].vue
@@ -27,15 +27,11 @@
>
取消关注
-
-
-
-
-
-
- {{ otherParticipant.username }}
-
-
-
-
- 加载中...
- {{ error }}
-
-
-
-
-
-
-
-
-
-