diff --git a/docs/deploy/fastgpt/docker-compose.yml b/docs/deploy/fastgpt/docker-compose.yml index de0f27774..7eb00ef2a 100644 --- a/docs/deploy/fastgpt/docker-compose.yml +++ b/docs/deploy/fastgpt/docker-compose.yml @@ -79,9 +79,6 @@ services: - GPT4KEY=sk-xxx - OPENAI_BASE_URL=https://api.openai.com/v1 - OPENAI_BASE_URL_AUTH=可选的安全凭证 - # claude - - CLAUDE_BASE_URL=calude模型请求地址 - - CLAUDE_KEY=CLAUDE_KEY nginx: image: nginx:alpine3.17 container_name: nginx diff --git a/docs/dev/.env.template b/docs/dev/.env.template new file mode 100644 index 000000000..74c7be4e3 --- /dev/null +++ b/docs/dev/.env.template @@ -0,0 +1,32 @@ +# 运行端口,如果不是 3000 口运行,需要改成其他的。注意:不是改了这个变量就会变成其他端口,而是因为改成其他端口,才用这个变量。 +PORT=3000 +# 代理 +# AXIOS_PROXY_HOST=127.0.0.1 +# AXIOS_PROXY_PORT=7890 +# email +MY_MAIL=xxx@qq.com +MAILE_CODE=xxx +# ali ems +aliAccessKeyId=xxx +aliAccessKeySecret=xxx +aliSignName=xxx +aliTemplateCode=SMS_xxx +# token +TOKEN_KEY=xxx +# root key, 最高权限 +ROOT_KEY=xxx +# 是否进行安全校验(1: 开启,0: 关闭) +SENSITIVE_CHECK=1 +# openai +# OPENAI_BASE_URL=https://api.openai.com/v1 +# OPENAI_BASE_URL_AUTH=可选的安全凭证(不需要的时候,记得去掉) +OPENAIKEY=sk-xxx # 对话用的key +OPENAI_TRAINING_KEY=sk-xxx # 训练用的key +GPT4KEY=sk-xxx +# db +MONGODB_URI=mongodb://username:password@0.0.0.0:27017/test?authSource=admin +PG_HOST=0.0.0.0 +PG_PORT=8100 +PG_USER=xxx +PG_PASSWORD=xxx +PG_DB_NAME=xxx \ No newline at end of file diff --git a/src/pages/chat/index.tsx b/src/pages/chat/index.tsx index abd377177..2d69acf9c 100644 --- a/src/pages/chat/index.tsx +++ b/src/pages/chat/index.tsx @@ -229,9 +229,11 @@ const Chat = ({ modelId, chatId }: { modelId: string; chatId: string }) => { })); // refresh data - generatingMessage(); - loadHistory({ pageNum: 1, init: true }); - loadMyModels(true); + setTimeout(() => { + generatingMessage(); + loadHistory({ pageNum: 1, init: true }); + loadMyModels(true); + }, 100); }, [ chatId, diff --git a/src/pages/chat/share.tsx b/src/pages/chat/share.tsx index ad03cc791..4412575a6 100644 --- a/src/pages/chat/share.tsx +++ b/src/pages/chat/share.tsx @@ -231,6 +231,16 @@ const Chat = ({ shareId, historyId }: { shareId: string; historyId: string }) => chats: responseHistory }); + window.top?.postMessage( + { + type: 'shareChatFinish', + data: { + responseText + } + }, + '*' + ); + setTimeout(() => { generatingMessage(); }, 100); diff --git a/src/pages/number/index.tsx b/src/pages/number/index.tsx index 9c34d3158..01fb62e99 100644 --- a/src/pages/number/index.tsx +++ b/src/pages/number/index.tsx @@ -141,7 +141,11 @@ const NumberSetting = ({ tableType }: { tableType: `${TableEnum}` }) => { router.replace('/login'); }, [router, setUserInfo]); - useQuery(['init'], initUserInfo); + useQuery(['init'], initUserInfo, { + onSuccess(res) { + reset(res); + } + }); const { data: { invitedAmount = 0, historyAmount = 0, residueAmount = 0 } = {} } = useQuery( ['getPromotionInitData'], getPromotionInitData diff --git a/src/store/user.ts b/src/store/user.ts index 122417da8..dfda188e0 100644 --- a/src/store/user.ts +++ b/src/store/user.ts @@ -14,7 +14,7 @@ import type { ModelSchema } from '@/types/mongoSchema'; type State = { userInfo: UserType | null; - initUserInfo: () => Promise; + initUserInfo: () => Promise; setUserInfo: (user: UserType | null) => void; updateUserInfo: (user: UserUpdateParams) => void; // model @@ -47,7 +47,7 @@ export const useUserStore = create()( async initUserInfo() { const res = await getTokenLogin(); get().setUserInfo(res); - return null; + return res; }, setUserInfo(user: UserType | null) { set((state) => {