user timezone

client/src/pages/account/components/Info.tsx

@@ -1,5 +1,5 @@
-import React, { useCallback } from 'react';
-import { Box, Flex, Button, useDisclosure, useTheme, Divider } from '@chakra-ui/react';
+import React, { useCallback, useRef } from 'react';
+import { Box, Flex, Button, useDisclosure, useTheme, Divider, Select } from '@chakra-ui/react';
 import { useForm } from 'react-hook-form';
 import { UserUpdateParams } from '@/types/user';
 import { useToast } from '@/hooks/useToast';
@@ -11,6 +11,7 @@ import { useSelectFile } from '@/hooks/useSelectFile';
 import { compressImg } from '@/utils/file';
 import { feConfigs } from '@/store/static';
 import { useTranslation } from 'next-i18next';
+import { timezoneList } from '@/utils/user';
 import Loading from '@/components/Loading';
 import Avatar from '@/components/Avatar';
 import MyIcon from '@/components/Icon';
@@ -33,6 +34,7 @@ const UserInfo = () => {
   const theme = useTheme();
   const { t } = useTranslation();
   const { userInfo, updateUserInfo, initUserInfo } = useUserStore();
+  const timezones = useRef(timezoneList());
   const { reset } = useForm<UserUpdateParams>({
     defaultValues: userInfo as UserType
   });
@@ -59,6 +61,7 @@ const UserInfo = () => {
     async (data: UserType) => {
       await updateUserInfo({
         avatar: data.avatar,
+        timezone: data.timezone,
         openaiAccount: data.openaiAccount
       });
       reset(data);
@@ -102,7 +105,13 @@ const UserInfo = () => {
   });
 
   return (
-    <Box display={['block', 'flex']} py={[2, 10]} justifyContent={'center'} fontSize={['lg', 'xl']}>
+    <Box
+      display={['block', 'flex']}
+      py={[2, 10]}
+      justifyContent={'center'}
+      alignItems={'flex-start'}
+      fontSize={['lg', 'xl']}
+    >
       <Flex
         flexDirection={'column'}
         alignItems={'center'}
@@ -135,11 +144,27 @@ const UserInfo = () => {
         mt={[6, 0]}
       >
         <Flex alignItems={'center'} w={['85%', '300px']}>
-          <Box flex={'0 0 50px'}>{t('user.Account')}:&nbsp;</Box>
+          <Box flex={'0 0 80px'}>{t('user.Account')}:&nbsp;</Box>
           <Box flex={1}>{userInfo?.username}</Box>
         </Flex>
         <Flex mt={6} alignItems={'center'} w={['85%', '300px']}>
-          <Box flex={'0 0 50px'}>{t('user.Password')}:&nbsp;</Box>
+          <Box flex={'0 0 80px'}>{t('user.Timezone')}:&nbsp;</Box>
+          <Select
+            value={userInfo?.timezone}
+            onChange={(e) => {
+              if (!userInfo) return;
+              onclickSave({ ...userInfo, timezone: e.target.value });
+            }}
+          >
+            {timezones.current.map((item) => (
+              <option key={item.value} value={item.value}>
+                {item.name}
+              </option>
+            ))}
+          </Select>
+        </Flex>
+        <Flex mt={6} alignItems={'center'} w={['85%', '300px']}>
+          <Box flex={'0 0 80px'}>{t('user.Password')}:&nbsp;</Box>
           <Box flex={1}>*****</Box>
           <Button size={['sm', 'md']} variant={'base'} ml={5} onClick={onOpenUpdatePsw}>
             {t('user.Change')}
@@ -149,7 +174,7 @@ const UserInfo = () => {
           <>
             <Box mt={6} whiteSpace={'nowrap'} w={['85%', '300px']}>
               <Flex alignItems={'center'}>
-                <Box flex={'0 0 50px'}>{t('user.Balance')}:&nbsp;</Box>
+                <Box flex={'0 0 80px'}>{t('user.Balance')}:&nbsp;</Box>
                 <Box flex={1}>
                   <strong>{userInfo?.balance.toFixed(3)}</strong> 元
                 </Box>

client/src/pages/api/chat/chatTest.ts

@@ -42,6 +42,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     /* user auth */
     const { userId, user } = await authUser({ req, authBalance: true });
 
+    if (!user) {
+      throw new Error('user not found');
+    }
+
     /* start process */
     const { responseData } = await dispatchModules({
       res,

client/src/pages/api/openapi/v1/chat/completions.ts

@@ -28,6 +28,7 @@ import { BillSourceEnum } from '@/constants/user';
 import { ChatHistoryItemResType } from '@/types/chat';
 import { UserModelSchema } from '@/types/mongoSchema';
 import { SystemInputEnum } from '@/constants/app';
+import { getSystemTime } from '@/utils/user';
 
 export type MessageItemType = ChatCompletionRequestMessage & { dataId?: string };
 type FastGptWebChatProps = {
@@ -95,9 +96,6 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
     if (!user) {
       throw new Error('Account is error');
     }
-    // if (authType === AuthUserTypeEnum.apikey || shareId) {
-    //   user.openaiAccount = undefined;
-    // }
 
     appId = appId ? appId : authAppid;
     if (!appId) {
@@ -249,6 +247,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
   }
 });
 
+/* running */
 export async function dispatchModules({
   res,
   modules,
@@ -260,12 +259,16 @@ export async function dispatchModules({
 }: {
   res: NextApiResponse;
   modules: AppModuleItemType[];
-  user?: UserModelSchema;
+  user: UserModelSchema;
   params?: Record<string, any>;
   variables?: Record<string, any>;
   stream?: boolean;
   detail?: boolean;
 }) {
+  variables = {
+    ...getSystemVariable({ timezone: user.timezone }),
+    ...variables
+  };
   const runningModules = loadModules(modules, variables);
 
   // let storeData: Record<string, any> = {}; // after module used
@@ -390,6 +393,7 @@ export async function dispatchModules({
   };
 }
 
+/* init store modules to running modules */
 function loadModules(
   modules: AppModuleItemType[],
   variables: Record<string, any>
@@ -431,6 +435,7 @@ function loadModules(
   });
 }
 
+/* sse response modules staus */
 export function responseStatus({
   res,
   status,
@@ -451,6 +456,13 @@ export function responseStatus({
   });
 }
 
+/* get system variable */
+export function getSystemVariable({ timezone }: { timezone: string }) {
+  return {
+    cTime: getSystemTime(timezone)
+  };
+}
+
 export const config = {
   api: {
     bodyParser: {

client/src/pages/api/user/account/update.ts

@@ -10,7 +10,7 @@ import { axiosConfig, getAIChatApi, openaiBaseUrl } from '@/service/lib/openai';
 /* update user info */
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
-    const { avatar, openaiAccount } = req.body as UserUpdateParams;
+    const { avatar, timezone, openaiAccount } = req.body as UserUpdateParams;
 
     const { userId } = await authUser({ req, authToken: true });
 
@@ -46,6 +46,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       },
       {
         ...(avatar && { avatar }),
+        ...(timezone && { timezone }),
         openaiAccount: openaiAccount?.key ? openaiAccount : null
       }
     );