diff --git a/packages/client/src/data/collector.tsx b/packages/client/src/data/collector.tsx index 35180444..171a5511 100644 --- a/packages/client/src/data/collector.tsx +++ b/packages/client/src/data/collector.tsx @@ -66,7 +66,7 @@ export const toggleCollectWiki = (wikiId, cookie = null): Promise => { * @returns */ export const useWikiCollectToggle = (wikiId) => { - const { data, error, refetch } = useQuery(`${CollectorApiDefinition.check.client()}?wikiId=${wikiId}`, () => + const { data, error, refetch } = useQuery([CollectorApiDefinition.check.client(), wikiId], () => getWikiIsCollected(wikiId) ); diff --git a/packages/client/src/data/document.tsx b/packages/client/src/data/document.tsx index 9efa5c6f..6bdf5a60 100644 --- a/packages/client/src/data/document.tsx +++ b/packages/client/src/data/document.tsx @@ -296,7 +296,11 @@ export const getDocumentChildren = (data, cookie = null): Promise { const { data, error, refetch } = useQuery( - isShare ? DocumentApiDefinition.getPublicChildren.client() : DocumentApiDefinition.getChildren.client(), + [ + isShare ? DocumentApiDefinition.getPublicChildren.client() : DocumentApiDefinition.getChildren.client(), + wikiId, + documentId, + ], () => getDocumentChildren({ wikiId, documentId, isShare }) ); const loading = !data && !error; diff --git a/packages/client/src/pages/_app.tsx b/packages/client/src/pages/_app.tsx index f362d942..223610c0 100644 --- a/packages/client/src/pages/_app.tsx +++ b/packages/client/src/pages/_app.tsx @@ -13,7 +13,15 @@ import { Hydrate, QueryClient, QueryClientProvider } from 'react-query'; class MyApp extends App<{ isMobile: boolean }> { state = { - queryClient: new QueryClient(), + queryClient: new QueryClient({ + defaultOptions: { + queries: { + refetchOnWindowFocus: true, + retry: false, + staleTime: 30000, + }, + }, + }), }; static getInitialProps = async ({ Component, ctx }) => { diff --git a/packages/client/src/pages/index.tsx b/packages/client/src/pages/index.tsx index ab36eebf..393fad74 100644 --- a/packages/client/src/pages/index.tsx +++ b/packages/client/src/pages/index.tsx @@ -65,7 +65,6 @@ const RecentDocs = () => { }} />, } />, - } />, - ) : ( -
- - {/* FIXME: semi-design 的问题,不加 div,文字会换行! */} -
-
-
- ) +
+ + {/* FIXME: semi-design 的问题,不加 div,文字会换行! */} +
+
+
} error={error} errorContent={(error) => ( diff --git a/packages/server/src/app-cluster.service.ts b/packages/server/src/app-cluster.service.ts index 4a7f2d58..380c849d 100644 --- a/packages/server/src/app-cluster.service.ts +++ b/packages/server/src/app-cluster.service.ts @@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common'; import * as cluster from 'cluster'; import * as os from 'os'; -const numCPUs = os.cpus().length; +const numCPUs = os.cpus().length - 2; @Injectable() export class AppClusterService {