From f17b644a9b397b0a4705a7ab894cebeaa075666b Mon Sep 17 00:00:00 2001
From: Tim <nagisa12164@163.com>
Date: Fri, 17 Oct 2025 15:10:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20avatar=20=E4=BB=A5=E5=8F=8A=20auth=20?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend_nuxt/app.vue                        |   3 +
 frontend_nuxt/components/BaseImage.vue       |   5 +-
 frontend_nuxt/components/BaseUserAvatar.vue  |  42 ++++++-------
 frontend_nuxt/components/HeaderComponent.vue |  61 ++++++-------------
 frontend_nuxt/pages/login.vue                |   3 +-
 frontend_nuxt/pages/message-box/index.vue    |   4 +-
 frontend_nuxt/pages/signup.vue               |   3 +-
 frontend_nuxt/public/default-avatar.jpg      | Bin 3672 -> 0 bytes
 frontend_nuxt/utils/auth.js                  |  45 ++++++--------
 frontend_nuxt/utils/discord.js               |   3 +-
 frontend_nuxt/utils/github.js                |   3 +-
 frontend_nuxt/utils/google.js                |   3 +-
 frontend_nuxt/utils/telegram.js              |   3 +-
 frontend_nuxt/utils/twitter.js               |   3 +-
 14 files changed, 67 insertions(+), 114 deletions(-)
 delete mode 100644 frontend_nuxt/public/default-avatar.jpg

diff --git a/frontend_nuxt/app.vue b/frontend_nuxt/app.vue
index 408521752..7b70e4858 100644
--- a/frontend_nuxt/app.vue
+++ b/frontend_nuxt/app.vue
@@ -41,10 +41,13 @@ import GlobalPopups from '~/components/GlobalPopups.vue'
 import ConfirmDialog from '~/components/ConfirmDialog.vue'
 import MessageFloatWindow from '~/components/MessageFloatWindow.vue'
 import { useIsMobile } from '~/utils/screen'
+import { checkToken } from '~/utils/auth'
 
 const isMobile = useIsMobile()
 const menuVisible = ref(!isMobile.value)
 
+await checkToken()
+
 const showNewPostIcon = computed(() => useRoute().path === '/')
 
 const hideMenu = computed(() => {
diff --git a/frontend_nuxt/components/BaseImage.vue b/frontend_nuxt/components/BaseImage.vue
index 2aa8a9cda..4c62021f6 100644
--- a/frontend_nuxt/components/BaseImage.vue
+++ b/frontend_nuxt/components/BaseImage.vue
@@ -17,7 +17,7 @@ import { computed, ref } from 'vue'
 import { useAttrs } from 'vue'
 
 const props = defineProps({
-  src: { type: String, required: true },
+  src: { type: String, default: '' },
   alt: { type: String, default: '' },
 })
 
@@ -39,9 +39,6 @@ const placeholder = computed(() => {
 function onLoad() {
   loaded.value = true
 }
-function onError() {
-  loaded.value = true
-}
 </script>
 
 <style scoped>
diff --git a/frontend_nuxt/components/BaseUserAvatar.vue b/frontend_nuxt/components/BaseUserAvatar.vue
index cb7c61617..b1ea2fc39 100644
--- a/frontend_nuxt/components/BaseUserAvatar.vue
+++ b/frontend_nuxt/components/BaseUserAvatar.vue
@@ -1,22 +1,20 @@
 <template>
-  <NuxtLink
-    :to="resolvedLink"
+  <div
     class="base-user-avatar"
     :class="wrapperClass"
     :style="wrapperStyle"
     v-bind="wrapperAttrs"
+    @click="handleClick"
   >
-    <BaseImage :src="currentSrc" :alt="altText" class="base-user-avatar-img" @error="onError" />
-  </NuxtLink>
+    <BaseImage :src="props.src" :alt="altText" class="base-user-avatar-img" />
+  </div>
 </template>
 
 <script setup>
-import { computed, ref, watch } from 'vue'
+import { computed, watch } from 'vue'
 import { useAttrs } from 'vue'
 import BaseImage from './BaseImage.vue'
 
-const DEFAULT_AVATAR = '/default-avatar.jpg'
-
 const props = defineProps({
   userId: {
     type: [String, Number],
@@ -50,15 +48,6 @@ const props = defineProps({
 
 const attrs = useAttrs()
 
-const currentSrc = ref(props.src || DEFAULT_AVATAR)
-
-watch(
-  () => props.src,
-  (value) => {
-    currentSrc.value = value || DEFAULT_AVATAR
-  },
-)
-
 const resolvedLink = computed(() => {
   if (props.to) return props.to
   if (props.userId !== null && props.userId !== undefined && props.userId !== '') {
@@ -70,10 +59,16 @@ const resolvedLink = computed(() => {
 const altText = computed(() => props.alt || '用户头像')
 
 const sizeStyle = computed(() => {
-  if (!props.width && props.width !== 0) return null
-  const value = typeof props.width === 'number' ? `${props.width}px` : props.width
-  if (!value) return null
-  return { width: value, height: value }
+  var style = {}
+
+  if (props.width > 0) {
+    style.width = `${props.width}px`
+  }
+  if (props.height > 0) {
+    style.height = `${props.height}px`
+  }
+
+  return style
 })
 
 const wrapperStyle = computed(() => {
@@ -88,10 +83,9 @@ const wrapperAttrs = computed(() => {
   return rest
 })
 
-function onError() {
-  if (currentSrc.value !== DEFAULT_AVATAR) {
-    currentSrc.value = DEFAULT_AVATAR
-  }
+const handleClick = () => {
+  if (props.disableLink) return
+  navigateTo(resolvedLink.value)
 }
 </script>
 
diff --git a/frontend_nuxt/components/HeaderComponent.vue b/frontend_nuxt/components/HeaderComponent.vue
index 074eeb9b7..431fb7144 100644
--- a/frontend_nuxt/components/HeaderComponent.vue
+++ b/frontend_nuxt/components/HeaderComponent.vue
@@ -78,7 +78,9 @@
             <div class="header-icon-item" @click="goToMessages">
               <message-emoji class="header-icon" />
               <span class="header-label">消息</span>
-              <span v-if="unreadMessageCount > 0" class="unread-badge">{{ unreadMessageCount }}</span>
+              <span v-if="unreadMessageCount > 0" class="unread-badge">{{
+                unreadMessageCount
+              }}</span>
               <span v-else-if="hasChannelUnread" class="unread-dot"></span>
             </div>
           </ToolTip>
@@ -89,10 +91,9 @@
                 <BaseUserAvatar
                   class="avatar-img"
                   :user-id="authState.userId"
-                  :src="avatar"
-                  alt="avatar"
-                  :width="32"
+                  :src="authState.avatar"
                   :disable-link="true"
+                  :width="32"
                 />
                 <down />
               </div>
@@ -117,7 +118,7 @@ import DropdownMenu from '~/components/DropdownMenu.vue'
 import ToolTip from '~/components/ToolTip.vue'
 import SearchDropdown from '~/components/SearchDropdown.vue'
 import BaseUserAvatar from '~/components/BaseUserAvatar.vue'
-import { authState, clearToken, loadCurrentUser } from '~/utils/auth'
+import { authState, clearToken } from '~/utils/auth'
 import { useUnreadCount } from '~/composables/useUnreadCount'
 import { useChannelsUnreadCount } from '~/composables/useChannelsUnreadCount'
 import { useIsMobile } from '~/utils/screen'
@@ -139,13 +140,11 @@ const isLogin = computed(() => authState.loggedIn)
 const isMobile = useIsMobile()
 const { count: unreadMessageCount, fetchUnreadCount } = useUnreadCount()
 const { hasUnread: hasChannelUnread, fetchChannelUnread } = useChannelsUnreadCount()
-const avatar = ref('')
 const showSearch = ref(false)
 const searchDropdown = ref(null)
 const userMenu = ref(null)
 const menuBtn = ref(null)
 const isCopying = ref(false)
-
 const onlineCount = ref(0)
 
 // 心跳检测
@@ -208,7 +207,7 @@ const copyInviteLink = async () => {
   const token = getToken()
   if (!token) {
     toast.error('请先登录')
-    isCopying.value = false   // 🔥 修复：未登录时立即复原状态
+    isCopying.value = false // 🔥 修复：未登录时立即复原状态
     return
   }
   try {
@@ -252,17 +251,7 @@ const copyRssLink = async () => {
 }
 
 const goToProfile = async () => {
-  if (!authState.loggedIn) {
-    navigateTo('/login', { replace: true })
-    return
-  }
-  let id = authState.username || authState.userId
-  if (!id) {
-    const user = await loadCurrentUser()
-    if (user) {
-      id = user.username || user.id
-    }
-  }
+  let id = authState.username || authState.id
   if (id) {
     navigateTo(`/users/${id}`, { replace: true })
   }
@@ -306,14 +295,6 @@ const iconClass = computed(() => {
 })
 
 onMounted(async () => {
-  const updateAvatar = async () => {
-    if (authState.loggedIn) {
-      const user = await loadCurrentUser()
-      if (user && user.avatar) {
-        avatar.value = user.avatar
-      }
-    }
-  }
   const updateUnread = async () => {
     if (authState.loggedIn) {
       fetchUnreadCount()
@@ -323,17 +304,8 @@ onMounted(async () => {
     }
   }
 
-  await updateAvatar()
   await updateUnread()
 
-  watch(
-    () => authState.loggedIn,
-    async (isLoggedIn) => {
-      await updateAvatar()
-      await updateUnread()
-    },
-  )
-
   // 新增的在线人数逻辑
   sendPing()
   fetchCount()
@@ -482,7 +454,6 @@ onMounted(async () => {
   cursor: pointer;
 }
 
-
 .invite_text:hover {
   opacity: 0.8;
   text-decoration: underline;
@@ -543,7 +514,10 @@ onMounted(async () => {
   color: var(--primary-color);
   cursor: pointer;
   position: relative;
-  transition: color 0.25s ease, transform 0.15s ease, opacity 0.2s ease;
+  transition:
+    color 0.25s ease,
+    transform 0.15s ease,
+    opacity 0.2s ease;
 }
 
 .header-icon-item:hover {
@@ -572,15 +546,14 @@ onMounted(async () => {
   position: absolute;
   top: -4px;
   right: -6px;
-  color: var(--primary-color);  /* 🔹 使用主题主色 */
-  background: none;             /* 🔹 去掉背景 */
-  font-size: 11px;              /* 字体稍微大一点以便清晰 */
-  font-weight: 600;             /* 加一点权重让数字更醒目 */
+  color: var(--primary-color); /* 🔹 使用主题主色 */
+  background: none; /* 🔹 去掉背景 */
+  font-size: 11px; /* 字体稍微大一点以便清晰 */
+  font-weight: 600; /* 加一点权重让数字更醒目 */
   line-height: 1;
-  padding: 0;                   /* 去掉内边距 */
+  padding: 0; /* 去掉内边距 */
 }
 
-
 @keyframes rss-glow {
   0% {
     text-shadow: 0 0 0px var(--primary-color);
diff --git a/frontend_nuxt/pages/login.vue b/frontend_nuxt/pages/login.vue
index 3e4570aa3..013e22642 100644
--- a/frontend_nuxt/pages/login.vue
+++ b/frontend_nuxt/pages/login.vue
@@ -40,7 +40,7 @@
 
 <script setup>
 import { toast } from '~/main'
-import { setToken, loadCurrentUser } from '~/utils/auth'
+import { setToken } from '~/utils/auth'
 import BaseInput from '~/components/BaseInput.vue'
 import ThirdPartyAuth from '~/components/ThirdPartyAuth.vue'
 import { registerPush } from '~/utils/push'
@@ -61,7 +61,6 @@ const submitLogin = async () => {
     const data = await res.json()
     if (res.ok && data.token) {
       setToken(data.token)
-      await loadCurrentUser()
       toast.success('登录成功')
       registerPush()
       await navigateTo('/', { replace: true })
diff --git a/frontend_nuxt/pages/message-box/index.vue b/frontend_nuxt/pages/message-box/index.vue
index 8b384352e..5d67c3e05 100644
--- a/frontend_nuxt/pages/message-box/index.vue
+++ b/frontend_nuxt/pages/message-box/index.vue
@@ -84,7 +84,7 @@
           >
             <div class="conversation-avatar">
               <BaseImage
-                :src="ch.avatar || '/default-avatar.jpg'"
+                :src="ch.avatar"
                 :alt="ch.name"
                 class="avatar-img"
                 @error="handleAvatarError"
@@ -194,7 +194,7 @@ function formatTime(timeString) {
 
 // 头像加载失败处理
 function handleAvatarError(event) {
-  event.target.src = '/default-avatar.jpg'
+  event.target.src = null
 }
 
 async function fetchChannels() {
diff --git a/frontend_nuxt/pages/signup.vue b/frontend_nuxt/pages/signup.vue
index f1f9d913b..73459f1b9 100644
--- a/frontend_nuxt/pages/signup.vue
+++ b/frontend_nuxt/pages/signup.vue
@@ -70,7 +70,7 @@
 <script setup>
 import BaseInput from '~/components/BaseInput.vue'
 import { toast } from '~/main'
-import { loadCurrentUser, setToken } from '~/utils/auth'
+import { setToken } from '~/utils/auth'
 import ThirdPartyAuth from '~/components/ThirdPartyAuth.vue'
 
 const route = useRoute()
@@ -172,7 +172,6 @@ const verifyCode = async () => {
       if (data.reason_code === 'VERIFIED_AND_APPROVED') {
         toast.success('注册成功')
         setToken(data.token)
-        loadCurrentUser()
         navigateTo('/', { replace: true })
       } else if (data.reason_code === 'VERIFIED') {
         if (registerMode.value === 'WHITELIST') {
diff --git a/frontend_nuxt/public/default-avatar.jpg b/frontend_nuxt/public/default-avatar.jpg
deleted file mode 100644
index 402804fcedd6ec0b90343256dba2544eea06ac54..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3672
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
SwfMEg9lK7(f4)_Jr~d=t_}|q4

diff --git a/frontend_nuxt/utils/auth.js b/frontend_nuxt/utils/auth.js
index 6fb558c13..5513295ee 100644
--- a/frontend_nuxt/utils/auth.js
+++ b/frontend_nuxt/utils/auth.js
@@ -1,33 +1,28 @@
 import { reactive } from 'vue'
 
 const TOKEN_KEY = 'token'
-const USER_ID_KEY = 'userId'
-const USERNAME_KEY = 'username'
-const ROLE_KEY = 'role'
 
 export const authState = reactive({
   loggedIn: false,
   userId: null,
   username: null,
   role: null,
+  avatar: null,
 })
 
 if (import.meta.client) {
   authState.loggedIn =
     localStorage.getItem(TOKEN_KEY) !== null && localStorage.getItem(TOKEN_KEY) !== ''
-  authState.userId = localStorage.getItem(USER_ID_KEY)
-  authState.username = localStorage.getItem(USERNAME_KEY)
-  authState.role = localStorage.getItem(ROLE_KEY)
 }
 
 export function getToken() {
   return import.meta.client ? localStorage.getItem(TOKEN_KEY) : null
 }
 
-export function setToken(token) {
+export async function setToken(token) {
   if (import.meta.client) {
     localStorage.setItem(TOKEN_KEY, token)
-    authState.loggedIn = true
+    await loadCurrentUser()
   }
 }
 
@@ -39,26 +34,20 @@ export function clearToken() {
   }
 }
 
-export function setUserInfo({ id, username }) {
+export function setUserInfo(user) {
   if (import.meta.client) {
-    authState.userId = id
-    authState.username = username
-    if (arguments[0] && arguments[0].role) {
-      authState.role = arguments[0].role
-      localStorage.setItem(ROLE_KEY, arguments[0].role)
-    }
-    if (id !== undefined && id !== null) localStorage.setItem(USER_ID_KEY, id)
-    if (username) localStorage.setItem(USERNAME_KEY, username)
+    authState.userId = user.id
+    authState.username = user.username
+    authState.avatar = user.avatar
+    authState.role = user.role
   }
 }
 
 export function clearUserInfo() {
   if (import.meta.client) {
-    localStorage.removeItem(USER_ID_KEY)
-    localStorage.removeItem(USERNAME_KEY)
-    localStorage.removeItem(ROLE_KEY)
     authState.userId = null
     authState.username = null
+    authState.avatar = null
     authState.role = null
   }
 }
@@ -82,9 +71,11 @@ export async function fetchCurrentUser() {
 export async function loadCurrentUser() {
   const user = await fetchCurrentUser()
   if (user) {
-    setUserInfo({ id: user.id, username: user.username, role: user.role })
+    setUserInfo(user)
+  } else {
+    clearUserInfo()
   }
-  return user
+  authState.loggedIn = user !== null
 }
 
 export function isLogin() {
@@ -100,10 +91,12 @@ export async function checkToken() {
     const res = await fetch(`${API_BASE_URL}/api/auth/check`, {
       headers: { Authorization: `Bearer ${token}` },
     })
-    authState.loggedIn = res.ok
-    return res.ok
+    if (res.ok) {
+      await setToken(token)
+    } else {
+      clearToken()
+    }
   } catch (e) {
-    authState.loggedIn = false
-    return false
+    clearToken()
   }
 }
diff --git a/frontend_nuxt/utils/discord.js b/frontend_nuxt/utils/discord.js
index 04353f59c..262782531 100644
--- a/frontend_nuxt/utils/discord.js
+++ b/frontend_nuxt/utils/discord.js
@@ -1,5 +1,5 @@
 import { toast } from '../main'
-import { setToken, loadCurrentUser } from './auth'
+import { setToken } from './auth'
 import { registerPush } from './push'
 
 export function discordAuthorize(inviteToken = '') {
@@ -47,7 +47,6 @@ export async function discordExchange(code, inviteToken = '', reason = '') {
 
     if (res.ok && data.token) {
       setToken(data.token)
-      await loadCurrentUser()
       toast.success('登录成功')
       registerPush?.()
       return { success: true, needReason: false }
diff --git a/frontend_nuxt/utils/github.js b/frontend_nuxt/utils/github.js
index 8ecc31ee5..0295f4a73 100644
--- a/frontend_nuxt/utils/github.js
+++ b/frontend_nuxt/utils/github.js
@@ -1,5 +1,5 @@
 import { toast } from '../main'
-import { setToken, loadCurrentUser } from './auth'
+import { setToken } from './auth'
 import { registerPush } from './push'
 
 export function githubAuthorize(inviteToken = '') {
@@ -45,7 +45,6 @@ export async function githubExchange(code, inviteToken = '', reason = '') {
 
     if (res.ok && data.token) {
       setToken(data.token)
-      await loadCurrentUser()
       toast.success('登录成功')
       registerPush?.()
       return { success: true, needReason: false }
diff --git a/frontend_nuxt/utils/google.js b/frontend_nuxt/utils/google.js
index 8288bb111..eff9b479f 100644
--- a/frontend_nuxt/utils/google.js
+++ b/frontend_nuxt/utils/google.js
@@ -1,5 +1,5 @@
 import { toast } from '../main'
-import { setToken, loadCurrentUser } from './auth'
+import { setToken } from './auth'
 import { registerPush } from './push'
 
 export async function googleGetIdToken() {
@@ -79,7 +79,6 @@ export async function googleAuthWithToken(
 
     if (res.ok && data && data.token) {
       setToken(data.token)
-      await loadCurrentUser()
       toast.success('登录成功')
       registerPush?.()
       if (typeof redirect_success === 'function') redirect_success()
diff --git a/frontend_nuxt/utils/telegram.js b/frontend_nuxt/utils/telegram.js
index be8457c9d..21ec316ac 100644
--- a/frontend_nuxt/utils/telegram.js
+++ b/frontend_nuxt/utils/telegram.js
@@ -1,5 +1,5 @@
 import { toast } from '../main'
-import { setToken, loadCurrentUser } from './auth'
+import { setToken } from './auth'
 import { registerPush } from './push'
 
 export function telegramAuthorize(inviteToken = '') {
@@ -34,7 +34,6 @@ export async function telegramExchange(authData, inviteToken = '', reason = '')
     const data = await res.json()
     if (res.ok && data.token) {
       setToken(data.token)
-      await loadCurrentUser()
       toast.success('登录成功')
       registerPush?.()
       return { success: true, needReason: false }
diff --git a/frontend_nuxt/utils/twitter.js b/frontend_nuxt/utils/twitter.js
index 2762d3e5e..15e22c5b5 100644
--- a/frontend_nuxt/utils/twitter.js
+++ b/frontend_nuxt/utils/twitter.js
@@ -1,5 +1,5 @@
 import { toast } from '../main'
-import { setToken, loadCurrentUser } from './auth'
+import { setToken } from './auth'
 import { registerPush } from './push'
 
 function generateCodeVerifier() {
@@ -99,7 +99,6 @@ export async function twitterExchange(code, state, reason) {
     const data = await res.json()
     if (res.ok && data.token) {
       setToken(data.token)
-      await loadCurrentUser()
       toast.success('登录成功')
       registerPush()
       return { success: true, needReason: false }