yexuejc007/PlayEdu-backend
1
0
Fork 0
mirror of https://github.com/PlayEdu/backend synced 2025-06-22 06:42:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

完成系统配置的加载

Browse Source
This commit is contained in:
none 2023-04-11 11:08:56 +08:00
parent 86964737d3
commit f05a696941
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pages/init/index.tsx
View File

@ -1,9 +1,14 @@
import { useDispatch } from "react-redux";
import { Outlet } from "react-router-dom";
import { loginAction } from "../../store/user/loginUserSlice";
import {
SystemConfigStoreInterface,
saveConfigAction,
} from "../../store/system/systemConfigSlice";
interface Props {
loginData: any | null;
loginData?: any;
configData?: any;
}
const InitPage = (props: Props) => {
@ -12,6 +17,19 @@ const InitPage = (props: Props) => {
dispatch(loginAction(props.loginData));
}
if (props.configData) {
let config: SystemConfigStoreInterface = {
systemName: props.configData["system.name"],
systemLogo: props.configData["system.logo"],
systemApiUrl: props.configData["system.api_url"],
systemPcUrl: props.configData["system.pc_url"],
systemH5Url: props.configData["system.h5_url"],
memberDefaultAvatar: props.configData["member.default_avatar"],
courseDefaultThumbs: props.configData["default.course_thumbs"],
};
dispatch(saveConfigAction(config));
}
return (
<>
<Outlet />

48
src/routes/index.tsx
View File

@ -1,6 +1,6 @@
import { lazy } from "react";
import { RouteObject } from "react-router-dom";
import { login } from "../api";
import { login, system } from "../api";
import InitPage from "../pages/init";
import { getToken } from "../utils";
@ -23,52 +23,34 @@ import DepartmentPage from "../pages/department";
import TestPage from "../pages/test";
import ErrorPage from "../pages/error";
// 异步加载页面
// const LoginPage = lazy(() => import("../pages/login"));
// const HomePage = lazy(() => import("../pages/home"));
// const DashboardPage = lazy(() => import("../pages/dashboard"));
// const ErrorPage = lazy(() => import("../pages/error"));
// const CoursePage = lazy(() => import("../pages/course"));
// const TestPage = lazy(() => import("../pages/test"));
// const MemberPage = lazy(() => import("../pages/member"));
// const MemberImportPage = lazy(() => import("../pages/member/import"));
// const SystemAdministratorPage = lazy(
// () => import("../pages/system/administrator")
// );
// const SystemAdminrolesPage = lazy(() => import("../pages/system/adminroles"));
// const DepartmentPage = lazy(() => import("../pages/department"));
// const ChangePasswordPage = lazy(() => import("../pages/change-password"));
// const ResourceImagesPage = lazy(() => import("../pages/resource/images"));
// const ResourceCategoryPage = lazy(
// () => import("../pages/resource/resource-category")
// );
// const ResourceVideosPage = lazy(() => import("../pages/resource/videos"));
// const SystemConfigPage = lazy(() => import("../pages/system/config"));
let RootPage: any = null;
if (getToken()) {
RootPage = lazy(async () => {
return new Promise<any>((resolve) => {
let userLoginToken = getToken();
if (!userLoginToken) {
return new Promise<any>(async (resolve) => {
try {
let configRes: any = await system.getSystemConfig();
let userRes: any = await login.getUser();
resolve({
default: InitPage,
default: (
<InitPage configData={configRes.data} loginData={userRes.data} />
),
});
} catch (e) {
console.error("系统初始化失败", e);
resolve({
default: <ErrorPage />,
});
return;
}
login.getUser().then((res: any) => {
resolve({
default: <InitPage loginData={res.data} />,
});
});
// todo token过期处理
});
});
} else {
if (window.location.pathname !== "/login") {
window.location.href = "/login";
}
RootPage = <InitPage loginData={null} />;
RootPage = <InitPage />;
}
const routes: RouteObject[] = [