ColdBreeze/ColdBreeze-chat-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: server version req

Browse Source
This commit is contained in:
Tristan Yang
2023-04-25 11:03:55 +08:00
parent 23d8fb757c
commit d11b3f37df
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/server.ts
+1 -1
View File
@@ -364,7 +364,7 @@ export const serverApi = createApi({
}); });
export const { export const {
useGetServerVersionQuery, useLazyGetServerVersionQuery,
useGetGithubAuthConfigQuery, useGetGithubAuthConfigQuery,
useUpdateGithubAuthConfigMutation, useUpdateGithubAuthConfigMutation,
useGetGoogleAuthConfigQuery, useGetGoogleAuthConfigQuery,
src/common/hook/usePreload.ts
+9 -5
View File
@@ -3,7 +3,7 @@ import dayjs from "dayjs";
import initCache, { useRehydrate } from "../../app/cache"; import initCache, { useRehydrate } from "../../app/cache";
import { useLazyGetFavoritesQuery } from "../../app/services/message"; import { useLazyGetFavoritesQuery } from "../../app/services/message";
import { useLazyGetUsersQuery } from "../../app/services/user"; import { useLazyGetUsersQuery } from "../../app/services/user";
import { useGetServerVersionQuery, useGetSystemCommonQuery, useLazyGetServerQuery } from "../../app/services/server"; import { useLazyGetSystemCommonQuery, useLazyGetServerQuery, useLazyGetServerVersionQuery } from "../../app/services/server";
import useStreaming from "./useStreaming"; import useStreaming from "./useStreaming";
import { useAppSelector } from "../../app/store"; import { useAppSelector } from "../../app/store";
import { useLazyLoadMoreMessagesQuery } from "../../app/services/message"; import { useLazyLoadMoreMessagesQuery } from "../../app/services/message";
@@ -52,10 +52,8 @@ export default function usePreload() {
getServer, getServer,
{ isLoading: serverLoading, isSuccess: serverSuccess, isError: serverError, data: server } { isLoading: serverLoading, isSuccess: serverSuccess, isError: serverError, data: server }
] = useLazyGetServerQuery(); ] = useLazyGetServerQuery();
const { data: currServerVersion, isSuccess: serverVersionSuccess, isLoading: loadingServerVersion } = useGetServerVersionQuery(); const [getServerVersion, { isSuccess: serverVersionSuccess, isLoading: loadingServerVersion }] = useLazyGetServerVersionQuery();
// 根据版本号判断是否需要调用system common api const [getSystemCommon] = useLazyGetSystemCommonQuery();
const skipSystemCommonApi = !(serverVersionSuccess && compareVersion(currServerVersion, '0.3.4') >= 0);
useGetSystemCommonQuery(undefined, { skip: skipSystemCommonApi });
useEffect(() => { useEffect(() => {
initCache(); initCache();
rehydrate(); rehydrate();
@@ -81,6 +79,12 @@ export default function usePreload() {
getUsers(); getUsers();
getServer(); getServer();
getFavorites(); getFavorites();
getServerVersion().then((resp) => {
if (resp.data && compareVersion(resp.data, '0.3.4') >= 0) {
// 根据版本号判断是否需要调用system common api
getSystemCommon();
}
});
} }
}, [rehydrated]); }, [rehydrated]);
const tokenAlmostExpire = dayjs().isAfter(new Date(expireTime - 20 * 1000)); const tokenAlmostExpire = dayjs().isAfter(new Date(expireTime - 20 * 1000));