Merge pull request #1073 from nagisa77/feature/ui_fix

fix: avatar 以及 auth 重构

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(() => {

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>

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>
 

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);

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 })

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() {

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') {

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()
   }
 }

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 }

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 }

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()

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 }

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 }