fix: revert vditor change

feat: 忘记密码页面添加提示 & 修复缺少定义导致的报错 #535

backend/src/main/java/com/openisle/config/SecurityConfig.java

@@ -81,8 +81,8 @@ public class SecurityConfig {
                 "http://localhost",
                 "http://30.211.97.238:3000",
                 "http://30.211.97.238",
-                "http://192.168.7.70",
+                "http://192.168.7.98",
-                "http://192.168.7.70:8080",
+                "http://192.168.7.98:3000",
                 websiteUrl,
                 websiteUrl.replace("://www.", "://")
         ));

frontend_nuxt/.env.example

@@ -1,6 +1,6 @@
 NUXT_PUBLIC_API_BASE_URL=https://www.open-isle.com
 NUXT_PUBLIC_WEBSITE_BASE_URL=https://www.open-isle.com
-NUXT_PUBLIC_GOOGLE_CLIENT_ID=777830451304-xxx.apps.googleusercontent.com
+NUXT_PUBLIC_GOOGLE_CLIENT_ID=777830451304-nt8afkkap18gui4f9entcha99unal744.apps.googleusercontent.com
 NUXT_PUBLIC_GITHUB_CLIENT_ID=Ov23liVkO1NPAX5JyWxJ
 NUXT_PUBLIC_DISCORD_CLIENT_ID=1394985417044000779
 NUXT_PUBLIC_TWITTER_CLIENT_ID=ZTRTU05KSk9KTTJrTTdrVC1tc1E6MTpjaQ

frontend_nuxt/assets/fonts.css

@@ -0,0 +1,143 @@
+/* Maple Mono - Thin 100 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-100-normal.woff2") format("woff2");
+  font-weight: 100;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - Thin Italic 100 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-100-italic.woff2") format("woff2");
+  font-weight: 100;
+  font-style: italic;
+  font-display: swap;
+}
+
+/* Maple Mono - ExtraLight 200 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-200-normal.woff2") format("woff2");
+  font-weight: 200;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - ExtraLight Italic 200 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-200-italic.woff2") format("woff2");
+  font-weight: 200;
+  font-style: italic;
+  font-display: swap;
+}
+
+/* Maple Mono - Light 300 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-300-normal.woff2") format("woff2");
+  font-weight: 300;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - Light Italic 300 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-300-italic.woff2") format("woff2");
+  font-weight: 300;
+  font-style: italic;
+  font-display: swap;
+}
+
+/* Maple Mono - Regular 400 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-400-normal.woff2") format("woff2");
+  font-weight: 400;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - Italic 400 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-400-italic.woff2") format("woff2");
+  font-weight: 400;
+  font-style: italic;
+  font-display: swap;
+}
+
+/* Maple Mono - Medium 500 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-500-normal.woff2") format("woff2");
+  font-weight: 500;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - Medium Italic 500 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-500-italic.woff2") format("woff2");
+  font-weight: 500;
+  font-style: italic;
+  font-display: swap;
+}
+
+/* Maple Mono - SemiBold 600 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-600-normal.woff2") format("woff2");
+  font-weight: 600;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - SemiBold Italic 600 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-600-italic.woff2") format("woff2");
+  font-weight: 600;
+  font-style: italic;
+  font-display: swap;
+}
+
+/* Maple Mono - Bold 700 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-700-normal.woff2") format("woff2");
+  font-weight: 700;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - Bold Italic 700 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-700-italic.woff2") format("woff2");
+  font-weight: 700;
+  font-style: italic;
+  font-display: swap;
+}
+
+/* Maple Mono - ExtraBold 800 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-800-normal.woff2") format("woff2");
+  font-weight: 800;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - ExtraBold Italic 800 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-800-italic.woff2") format("woff2");
+  font-weight: 800;
+  font-style: italic;
+  font-display: swap;
+}

frontend_nuxt/assets/global.css

@@ -17,6 +17,7 @@
   --scroller-background-color: rgba(130, 175, 180, 0.5);
   --normal-background-color: rgb(241, 241, 241);
   --lottery-background-color: rgb(241, 241, 241);
+  --code-highlight-background-color: rgb(241, 241, 241);
   --login-background-color: rgb(248, 248, 248);
   --login-background-color-hover: #e0e0e0;
   --text-color: black;
@@ -44,6 +45,7 @@
   --menu-text-color: white;
   --normal-background-color: #000000;
   --lottery-background-color: #4e4e4e;
+  --code-highlight-background-color: #262b35;
   --login-background-color: #575757;
   --login-background-color-hover: #717171;
   --text-color: #eee;
@@ -131,13 +133,43 @@ body {
 }
 
 .info-content-text pre {
-  background-color: var(--normal-background-color);
+  display: flex;
+  background-color: var(--code-highlight-background-color);
   padding: 8px 12px;
   border-radius: 4px;
   line-height: 1.5;
   position: relative;
 }
 
+.info-content-text pre .line-numbers {
+  counter-reset: line-number 0;
+  width: 2em;
+  font-size: 13px;
+  position: sticky;
+  flex-shrink: 0;
+  font-family: 'Maple Mono', monospace;
+  margin: 1em 0;
+  color: #888;
+  border-right: 1px solid #888;
+  box-sizing: border-box;
+  padding-right: 0.5em;
+  text-align: end;
+}
+
+.info-content-text pre .line-numbers .line-number::before {
+  content: counter(line-number);
+  counter-increment: line-number;
+}
+
+.info-content-text code {
+  font-family: 'Maple Mono', monospace;
+  font-size: 13px;
+  border-radius: 4px;
+  white-space: no-wrap;
+  background-color: var(--code-highlight-background-color);
+  color: var(--text-color);
+}
+
 .copy-code-btn {
   position: absolute;
   top: 4px;
@@ -156,15 +188,6 @@ body {
   opacity: 1;
 }
 
-.info-content-text code {
-  font-family: 'Roboto Mono', monospace;
-  font-size: 13px;
-  border-radius: 4px;
-  white-space: pre-wrap;
-  background-color: var(--normal-background-color);
-  color: var(--text-color);
-}
-
 .info-content-text a {
   color: var(--primary-color);
   text-decoration: none;
@@ -267,7 +290,7 @@ body {
   }
 
   .info-content-text pre {
-    line-height: 1.1;
+    line-height: 1.5;
   }
 
   .vditor-panel {

frontend_nuxt/components/DropdownMenu.vue

@@ -82,6 +82,7 @@ export default {
 .dropdown-item {
   padding: 8px 16px;
   white-space: nowrap;
+  cursor: pointer;
 }
 .dropdown-item:hover {
   background-color: var(--menu-selected-background-color);

frontend_nuxt/components/HeaderComponent.vue

@@ -146,14 +146,6 @@ onMounted(async () => {
       await updateUnread()
     },
   )
-
-  watch(
-    () => router.currentRoute.value.fullPath,
-    () => {
-      if (userMenu.value) userMenu.value.close()
-      showSearch.value = false
-    },
-  )
 })
 </script>
 

frontend_nuxt/components/MenuComponent.vue

@@ -128,41 +128,46 @@ import { ref, computed, watch, onMounted } from 'vue'
 import { themeState, cycleTheme, ThemeMode } from '~/utils/theme'
 import { authState } from '~/utils/auth'
 import { fetchUnreadCount, notificationState } from '~/utils/notification'
+
 const config = useRuntimeConfig()
 const API_BASE_URL = config.public.apiBaseUrl
 
 const props = defineProps({
-  visible: {
+  visible: { type: Boolean, default: true },
-    type: Boolean,
-    default: true,
-  },
 })
-
 const emit = defineEmits(['item-click'])
 
 const categoryOpen = ref(true)
 const tagOpen = ref(true)
-const isLoadingCategory = ref(false)
-const isLoadingTag = ref(false)
-const categoryData = ref([])
-const tagData = ref([])
 
-const fetchCategoryData = async () => {
+/** ✅ 用 useAsyncData 替换原生 fetch，避免 SSR+CSR 二次请求 */
-  isLoadingCategory.value = true
+const {
-  const res = await fetch(`${API_BASE_URL}/api/categories`)
+  data: categoryData,
-  const data = await res.json()
+  pending: isLoadingCategory,
-  categoryData.value = data
+  error: categoryError,
-  isLoadingCategory.value = false
+} = await useAsyncData(
-}
+  // 稳定 key：避免 hydration 期误判
+  'menu:categories',
+  () => $fetch(`${API_BASE_URL}/api/categories`),
+  {
+    server: true, // SSR 预取
+    default: () => [], // 初始默认值，减少空判断
+    // 5 分钟内复用缓存，避免路由往返重复请求
+    staleTime: 5 * 60 * 1000,
+  },
+)
 
-const fetchTagData = async () => {
+const {
-  isLoadingTag.value = true
+  data: tagData,
-  const res = await fetch(`${API_BASE_URL}/api/tags?limit=10`)
+  pending: isLoadingTag,
-  const data = await res.json()
+  error: tagError,
-  tagData.value = data
+} = await useAsyncData('menu:tags', () => $fetch(`${API_BASE_URL}/api/tags?limit=10`), {
-  isLoadingTag.value = false
+  server: true,
-}
+  default: () => [],
+  staleTime: 5 * 60 * 1000,
+})
 
+/** 其余逻辑保持不变 */
 const iconClass = computed(() => {
   switch (themeState.mode) {
     case ThemeMode.DARK:
@@ -188,6 +193,7 @@ const updateCount = async () => {
 
 onMounted(async () => {
   await updateCount()
+  // 登录态变化时再拉一次未读数；与 useAsyncData 无关
   watch(() => authState.loggedIn, updateCount)
 })
 
@@ -211,8 +217,6 @@ const gotoTag = (t) => {
   navigateTo({ path: '/', query: { tags: value } }, { replace: true })
   handleItemClick()
 }
-
-await Promise.all([fetchCategoryData(), fetchTagData()])
 </script>
 
 <style scoped>

frontend_nuxt/components/SearchDropdown.vue

@@ -110,6 +110,10 @@ watch(selected, (val) => {
   selected.value = null
   keyword.value = ''
 })
+
+defineExpose({
+  toggle,
+})
 </script>
 
 <style scoped>

frontend_nuxt/nuxt.config.ts

@@ -12,8 +12,8 @@ export default defineNuxtConfig({
       twitterClientId: process.env.NUXT_PUBLIC_TWITTER_CLIENT_ID || '',
     },
   },
-  // Ensure Vditor styles load before our overrides in global.css
+  // 确保 Vditor 样式在 global.css 覆盖前加载
-  css: ['vditor/dist/index.css', '~/assets/global.css'],
+  css: ['vditor/dist/index.css', '~/assets/fonts.css', '~/assets/global.css'],
   app: {
     head: {
       script: [

frontend_nuxt/pages/forgot-password.vue

@@ -2,6 +2,7 @@
   <div class="forgot-page">
     <div class="forgot-content">
       <div class="forgot-title">找回密码</div>
+ 
       <div v-if="step === 0" class="step-content">
         <BaseInput icon="fas fa-envelope" v-model="email" placeholder="邮箱" />
         <div v-if="emailError" class="error-message">{{ emailError }}</div>
@@ -19,6 +20,10 @@
         <div class="primary-button" @click="resetPassword" v-if="!isResetting">重置密码</div>
         <div class="primary-button disabled" v-else>提交中...</div>
       </div>
+      <div class="hint-message">
+        <i class="fas fa-info-circle"></i>
+        使用 Google 注册的用户可使用对应的邮箱进行找回密码
+      </div>
     </div>
   </div>
 </template>
@@ -26,6 +31,8 @@
 <script setup>
 import { toast } from '~/main'
 import BaseInput from '~/components/BaseInput.vue'
+import { useRoute } from 'vue-router'
+
 const config = useRuntimeConfig()
 const API_BASE_URL = config.public.apiBaseUrl
 
@@ -39,6 +46,7 @@ const passwordError = ref('')
 const isSending = ref(false)
 const isVerifying = ref(false)
 const isResetting = ref(false)
+const route = useRoute()
 
 onMounted(() => {
   if (route.query.email) {
@@ -137,6 +145,21 @@ const resetPassword = async () => {
   font-size: 24px;
   font-weight: bold;
 }
+
+.forgot-content .hint-message {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  gap: 8px;
+  padding: 8px 0;
+  font-size: 13px;
+  color: var(--blockquote-text-color);
+}
+
+.hint-message i {
+  color: var(--primary-color);
+  font-size: 14px;
+}
 .step-content {
   display: flex;
   flex-direction: column;

frontend_nuxt/pages/index.vue

@@ -116,7 +116,7 @@
   </div>
 </template>
 <script setup>
-import { ref, watch, watchEffect, computed, onMounted, onBeforeUnmount } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import ArticleCategory from '~/components/ArticleCategory.vue'
 import ArticleTags from '~/components/ArticleTags.vue'
 import CategorySelect from '~/components/CategorySelect.vue'
@@ -195,7 +195,7 @@ watch(
 const loadOptions = async () => {
   if (selectedCategory.value && !isNaN(selectedCategory.value)) {
     try {
-      const res = await fetch(`${API_BASE_URL}/api/categories/${selectedCategory.value}`)
+      const res = await fetch(`${API_BASE_URL}/api/categories/`)
       if (res.ok) categoryOptions.value = [await res.json()]
     } catch {}
   }

frontend_nuxt/pages/new-post.vue

@@ -77,7 +77,7 @@
   </div>
 </template>
 
-<script>
+<script setup>
 import 'flatpickr/dist/flatpickr.css'
 import { computed, onMounted, ref, watch } from 'vue'
 import FlatPickr from 'vue-flatpickr-component'

frontend_nuxt/pages/posts/[id]/index.vue

@@ -232,7 +232,7 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, onBeforeUnmount, nextTick, watch } from 'vue'
+import { ref, computed, onMounted, onBeforeUnmount, nextTick, watch, watchEffect } from 'vue'
 import VueEasyLightbox from 'vue-easy-lightbox'
 import { useRoute } from 'vue-router'
 import CommentItem from '~/components/CommentItem.vue'
@@ -268,7 +268,6 @@ const postReactions = ref([])
 const comments = ref([])
 const status = ref('PUBLISHED')
 const pinnedAt = ref(null)
-const isWaitingFetchingPost = ref(false)
 const isWaitingPostingComment = ref(false)
 const postTime = ref('')
 const postItems = ref([])
@@ -455,38 +454,41 @@ const onCommentDeleted = (id) => {
   fetchComments()
 }
 
-const fetchPost = async () => {
+const {
-  try {
+  data: postData,
-    isWaitingFetchingPost.value = true
+  pending: pendingPost,
-    const token = getToken()
+  error: postError,
-    const res = await fetch(`${API_BASE_URL}/api/posts/${postId}`, {
+  refresh: refreshPost,
-      headers: { Authorization: token ? `Bearer ${token}` : '' },
+} = await useAsyncData(`post-${postId}`, () => $fetch(`${API_BASE_URL}/api/posts/${postId}`), {
-    })
+  server: true,
-    isWaitingFetchingPost.value = false
+  lazy: false,
-    if (!res.ok) {
+})
-      if (res.status === 404 && process.client) {
+
-        router.replace('/404')
+// 用 pendingPost 驱动现有 UI（替代 isWaitingFetchingPost 手控）
-      }
+const isWaitingFetchingPost = computed(() => pendingPost.value)
-      return
+
-    }
+// 同步到现有的响应式字段
-    const data = await res.json()
+watchEffect(() => {
-    postContent.value = data.content
+  const data = postData.value
-    author.value = data.author
+  if (!data) return
-    title.value = data.title
+  postContent.value = data.content
-    category.value = data.category
+  author.value = data.author
-    tags.value = data.tags || []
+  title.value = data.title
-    postReactions.value = data.reactions || []
+  category.value = data.category
-    subscribed.value = !!data.subscribed
+  tags.value = data.tags || []
-    status.value = data.status
+  postReactions.value = data.reactions || []
-    pinnedAt.value = data.pinnedAt
+  subscribed.value = !!data.subscribed
-    postTime.value = TimeManager.format(data.createdAt)
+  status.value = data.status
-    lottery.value = data.lottery || null
+  pinnedAt.value = data.pinnedAt
-    if (lottery.value && lottery.value.endTime) startCountdown()
+  postTime.value = TimeManager.format(data.createdAt)
-    await nextTick()
+  lottery.value = data.lottery || null
-  } catch (e) {
+  if (lottery.value && lottery.value.endTime) startCountdown()
-    console.error(e)
+})
-  }
+
-}
+// 404 客户端跳转
+// if (postError.value?.statusCode === 404 && process.client) {
+//   router.replace('/404')
+// }
 
 const totalPosts = computed(() => comments.value.length + 1)
 const lastReplyTime = computed(() =>
@@ -607,6 +609,7 @@ const approvePost = async () => {
   if (res.ok) {
     status.value = 'PUBLISHED'
     toast.success('已通过审核')
+    await refreshPost()
   } else {
     toast.error('操作失败')
   }
@@ -620,8 +623,8 @@ const pinPost = async () => {
     headers: { Authorization: `Bearer ${token}` },
   })
   if (res.ok) {
-    pinnedAt.value = new Date().toISOString()
     toast.success('已置顶')
+    await refreshPost()
   } else {
     toast.error('操作失败')
   }
@@ -635,8 +638,8 @@ const unpinPost = async () => {
     headers: { Authorization: `Bearer ${token}` },
   })
   if (res.ok) {
-    pinnedAt.value = null
     toast.success('已取消置顶')
+    await refreshPost()
   } else {
     toast.error('操作失败')
   }
@@ -674,6 +677,7 @@ const rejectPost = async () => {
   if (res.ok) {
     status.value = 'REJECTED'
     toast.success('已驳回')
+    await refreshPost()
   } else {
     toast.error('操作失败')
   }
@@ -709,7 +713,7 @@ const joinLottery = async () => {
   })
   if (res.ok) {
     toast.success('已参与抽奖')
-    await fetchPost()
+    await refreshPost()
   } else {
     toast.error('操作失败')
   }
@@ -780,9 +784,8 @@ onMounted(async () => {
   window.addEventListener('scroll', updateCurrentIndex)
   jumpToHashComment()
 })
-
-await fetchPost()
 </script>
+
 <style>
 .post-page-container {
   background-color: var(--background-color);

frontend_nuxt/plugins/soft-manifest.client.ts

@@ -1,9 +0,0 @@
-import { defineNuxtPlugin } from 'nuxt/app'
-
-export default defineNuxtPlugin((nuxtApp) => {
-  // 覆盖默认行为：收到 manifest 更新时，不立刻在路由切换里刷新
-  nuxtApp.hooks.hook('app:manifest:update', () => {
-    // todo 选择：弹个提示，让用户点击刷新；或延迟到页面隐藏时再刷新
-    // 例如：document.addEventListener('visibilitychange', () => { if (document.hidden) location.reload() })
-  })
-})

frontend_nuxt/utils/google.js

@@ -24,6 +24,7 @@ export async function googleGetIdToken() {
 export function googleAuthorize() {
   const config = useRuntimeConfig()
   const GOOGLE_CLIENT_ID = config.public.googleClientId
+  const WEBSITE_BASE_URL = config.public.websiteBaseUrl
   if (!GOOGLE_CLIENT_ID) {
     toast.error('Google 登录不可用, 请检查网络设置与VPN')
     return

frontend_nuxt/utils/markdown.js

@@ -1,5 +1,14 @@
 import hljs from 'highlight.js'
-import 'highlight.js/styles/github.css'
+if (typeof window !== 'undefined') {
+  const theme =
+    document.documentElement.dataset.theme ||
+    (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light')
+  if (theme === 'dark') {
+    import('highlight.js/styles/atom-one-dark.css')
+  } else {
+    import('highlight.js/styles/atom-one-light.css')
+  }
+}
 import MarkdownIt from 'markdown-it'
 import { toast } from '../main'
 import { tiebaEmoji } from './tiebaEmoji'
@@ -86,7 +95,11 @@ const md = new MarkdownIt({
     } else {
       code = hljs.highlightAuto(str).value
     }
-    return `<pre class="code-block"><button class="copy-code-btn">Copy</button><code class="hljs language-${lang || ''}">${code}</code></pre>`
+    const lineNumbers = code
+      .trim()
+      .split('\n')
+      .map(() => `<div class="line-number"></div>`)
+    return `<pre class="code-block"><button class="copy-code-btn">Copy</button><div class="line-numbers">${lineNumbers.join('')}</div><code class="hljs language-${lang || ''}">${code.trim()}</code></pre>`
   },
 })