diff --git a/src/pages/Authorized.js b/src/pages/Authorized.js
index e2c92e89f9a2c87c9d77a61d8436e99a5c038474..5889812b685d096519e90ff29e837321aa88e032 100644
--- a/src/pages/Authorized.js
+++ b/src/pages/Authorized.js
@@ -3,9 +3,12 @@ import Redirect from 'umi/redirect';
import pathToRegexp from 'path-to-regexp';
import { connect } from 'dva';
import Authorized from '@/utils/Authorized';
+import { getAuthority } from '@/utils/authority';
+import Exception403 from '@/pages/Exception/403';
-function AuthComponent({ children, location, routerData, status }) {
- const isLogin = status === 'ok';
+function AuthComponent({ children, location, routerData }) {
+ const auth = getAuthority();
+ const isLogin = auth && auth[0] !== 'guest';
const getRouteAuthority = (path, routeData) => {
let authorities;
routeData.forEach(route => {
@@ -21,17 +24,15 @@ function AuthComponent({ children, location, routerData, status }) {
});
return authorities;
};
-
return (
: }
+ noMatch={isLogin ? : }
>
{children}
);
}
-export default connect(({ menu: menuModel, login: loginModel }) => ({
+export default connect(({ menu: menuModel }) => ({
routerData: menuModel.routerData,
- status: loginModel.status,
}))(AuthComponent);