perf: avatar

src/api/response/chat.d.ts

@@ -16,6 +16,7 @@ export interface InitChatResponse {
 
 export interface InitShareChatResponse {
   maxContext: number;
+  userAvatar: string;
   model: {
     name: string;
     avatar: string;

src/components/Avatar/index.tsx

@@ -1,16 +1,19 @@
 import React from 'react';
 import { Image } from '@chakra-ui/react';
 import type { ImageProps } from '@chakra-ui/react';
+import { LOGO_ICON } from '@/constants/chat';
 
 const Avatar = ({ w = '30px', ...props }: ImageProps) => {
+  console.log(props.src);
   return (
     <Image
-      fallbackSrc="/icon/logo.png"
+      fallbackSrc={LOGO_ICON}
       borderRadius={'50%'}
       objectFit={'cover'}
       alt=""
       w={w}
       h={w}
+      p={'1px'}
       {...props}
     />
   );

src/components/Layout/navbar.tsx

@@ -5,6 +5,7 @@ import MyIcon from '../Icon';
 import { useUserStore } from '@/store/user';
 import { useChatStore } from '@/store/chat';
 import Avatar from '../Avatar';
+import { HUMAN_ICON } from '@/constants/chat';
 
 export enum NavbarTypeEnum {
   normal = 'normal',
@@ -83,7 +84,7 @@ const Navbar = () => {
         cursor={'pointer'}
         onClick={() => router.push('/number')}
       >
-        <Avatar w={'36px'} h={'36px'} src={userInfo?.avatar} fallbackSrc={'/icon/human.png'} />
+        <Avatar w={'36px'} h={'36px'} src={userInfo?.avatar} fallbackSrc={HUMAN_ICON} />
       </Box>
       {/* 导航列表 */}
       <Box flex={1}>

src/components/WxConcat/index.tsx

@@ -31,7 +31,7 @@ const WxConcat = ({ onClose }: { onClose: () => void }) => {
           <Box mt={2}>
             微信号:
             <Box as={'span'} userSelect={'all'}>
-              fastgpt123
+              YNyiqi
             </Box>
           </Box>
         </ModalBody>

src/pages/api/chat/shareChat/init.ts

@@ -1,9 +1,10 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { connectToDatabase, ShareChat } from '@/service/mongo';
+import { connectToDatabase, ShareChat, User } from '@/service/mongo';
 import type { InitShareChatResponse } from '@/api/response/chat';
 import { authModel } from '@/service/utils/auth';
 import { hashPassword } from '@/service/utils/tools';
+import { HUMAN_ICON } from '@/constants/chat';
 
 /* 初始化我的聊天框，需要身份验证 */
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
@@ -40,9 +41,12 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       authOwner: false
     });
 
+    const user = await User.findById(shareChat.userId, 'avatar');
+
     jsonRes<InitShareChatResponse>(res, {
       data: {
         maxContext: shareChat.maxContext,
+        userAvatar: user?.avatar || HUMAN_ICON,
         model: {
           name: model.name,
           avatar: model.avatar,

src/pages/chat/components/Empty.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 import { Card, Box, Flex } from '@chakra-ui/react';
 import { useMarkdown } from '@/hooks/useMarkdown';
 import Markdown from '@/components/Markdown';
-import { LOGO_ICON } from '@/constants/chat';
 import Avatar from '@/components/Avatar';
 
 const Empty = ({

src/pages/chat/index.tsx

@@ -36,7 +36,6 @@ import { streamFetch } from '@/api/fetch';
 import MyIcon from '@/components/Icon';
 import { throttle } from 'lodash';
 import { Types } from 'mongoose';
-import { LOGO_ICON } from '@/constants/chat';
 import { ChatModelMap } from '@/constants/model';
 import { useChatStore } from '@/store/chat';
 import { useLoading } from '@/hooks/useLoading';
@@ -49,6 +48,7 @@ import SideBar from '@/components/SideBar';
 import Avatar from '@/components/Avatar';
 import Empty from './components/Empty';
 import QuoteModal from './components/QuoteModal';
+import { HUMAN_ICON } from '@/constants/chat';
 
 const PhoneSliderBar = dynamic(() => import('./components/PhoneSliderBar'), {
   ssr: false
@@ -713,8 +713,8 @@ const Chat = ({ modelId, chatId }: { modelId: string; chatId: string }) => {
                           className="avatar"
                           src={
                             item.obj === 'Human'
-                              ? userInfo?.avatar || '/icon/human.png'
-                              : chatData.model.avatar || LOGO_ICON
+                              ? userInfo?.avatar || HUMAN_ICON
+                              : chatData.model.avatar
                           }
                           w={['20px', '34px']}
                           h={['20px', '34px']}

src/pages/chat/share.tsx

@@ -38,7 +38,6 @@ import { streamFetch } from '@/api/fetch';
 import MyIcon from '@/components/Icon';
 import { throttle } from 'lodash';
 import { Types } from 'mongoose';
-import { LOGO_ICON } from '@/constants/chat';
 import { useChatStore } from '@/store/chat';
 import { useLoading } from '@/hooks/useLoading';
 import { fileDownload } from '@/utils/file';
@@ -49,6 +48,7 @@ import Markdown from '@/components/Markdown';
 import SideBar from '@/components/SideBar';
 import Avatar from '@/components/Avatar';
 import Empty from './components/Empty';
+import { HUMAN_ICON } from '@/constants/chat';
 
 const ShareHistory = dynamic(() => import('./components/ShareHistory'), {
   loading: () => <Loading fixed={false} />,
@@ -101,7 +101,6 @@ const Chat = ({ shareId, historyId }: { shareId: string; historyId: string }) =>
   const { copyData } = useCopyData();
   const { isPc } = useGlobalStore();
   const { Loading, setIsLoading } = useLoading();
-  const { userInfo } = useUserStore();
   const { isOpen: isOpenSlider, onClose: onCloseSlider, onOpen: onOpenSlider } = useDisclosure();
   const {
     isOpen: isOpenPassword,
@@ -628,8 +627,8 @@ const Chat = ({ shareId, historyId }: { shareId: string; historyId: string }) =>
                       <Avatar
                         src={
                           item.obj === 'Human'
-                            ? userInfo?.avatar || '/icon/human.png'
-                            : shareChatData.model.avatar || LOGO_ICON
+                            ? shareChatData.userAvatar || HUMAN_ICON
+                            : shareChatData.model.avatar
                         }
                         w={['20px', '34px']}
                         h={['20px', '34px']}

src/service/models/user.ts

@@ -2,6 +2,7 @@ import { Schema, model, models, Model } from 'mongoose';
 import { hashPassword } from '@/service/utils/tools';
 import { PRICE_SCALE } from '@/constants/common';
 import { UserModelSchema } from '@/types/mongoSchema';
+
 const UserSchema = new Schema({
   username: {
     // 可以是手机/邮箱，新的验证都只用手机

src/store/chat.ts

@@ -11,6 +11,7 @@ import {
   ShareChatType
 } from '@/types/chat';
 import { getChatHistory } from '@/api/chat';
+import { HUMAN_ICON } from '@/constants/chat';
 
 type SetShareChatHistoryItem = {
   historyId: string;
@@ -57,6 +58,7 @@ const defaultChatData = {
 };
 const defaultShareChatData: ShareChatType = {
   maxContext: 5,
+  userAvatar: HUMAN_ICON,
   model: {
     name: '',
     avatar: '/icon/logo.png',