From 7815eecd609299cec4fc09a9e3d6121b59173104 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Mon, 13 Nov 2017 13:35:33 +0800
Subject: [PATCH] 404 page for /xxx/whatever

---
 src/layouts/BasicLayout.js | 6 ++++--
 src/router.js              | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js
index 6ccc0cc6..84ec4e62 100644
--- a/src/layouts/BasicLayout.js
+++ b/src/layouts/BasicLayout.js
@@ -8,12 +8,13 @@ import moment from 'moment';
 import groupBy from 'lodash/groupBy';
 import { ContainerQuery } from 'react-container-query';
 import classNames from 'classnames';
-import styles from './BasicLayout.less';
 import HeaderSearch from '../components/HeaderSearch';
 import NoticeIcon from '../components/NoticeIcon';
 import GlobalFooter from '../components/GlobalFooter';
 import { getNavData } from '../common/nav';
 import { getRouteData } from '../utils/utils';
+import NotFound from '../routes/Exception/404';
+import styles from './BasicLayout.less';
 
 const { Header, Sider, Content } = Layout;
 const { SubMenu } = Menu;
@@ -356,7 +357,8 @@ class BasicLayout extends React.PureComponent {
                   )
                 )
               }
-              <Redirect to="/dashboard/analysis" />
+              <Redirect exact from="/" to="/dashboard/analysis" />
+              <Route component={NotFound} />
             </Switch>
             <GlobalFooter
               links={[{
diff --git a/src/router.js b/src/router.js
index f50bdf24..cb53d6d1 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Router, Route, Switch, Redirect } from 'dva/router';
+import { Router, Route, Switch } from 'dva/router';
 import { LocaleProvider } from 'antd';
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import BasicLayout from './layouts/BasicLayout';
@@ -12,7 +12,6 @@ function RouterConfig({ history }) {
         <Switch>
           <Route path="/user" component={UserLayout} />
           <Route path="/" component={BasicLayout} />
-          <Redirect to="/" />
         </Switch>
       </Router>
     </LocaleProvider>
-- 
GitLab