diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js
index 0f5e826e13fcdcb4d09b94a2899d40a01dc05aa8..59b254cfe49ee650bf85ead7221c1cbb20d09fcc 100644
--- a/src/layouts/BasicLayout.js
+++ b/src/layouts/BasicLayout.js
@@ -102,10 +102,15 @@ class BasicLayout extends React.PureComponent {
     // According to the url parameter to redirect
     // 这里是重定向的,重定向到 url 的 redirect 参数所示地址
     const urlParams = new URL(window.location.href);
-    const redirect = urlParams.searchParams.get('redirect') || '/dashboard/analysis';
+
+    const redirect = urlParams.searchParams.get('redirect');
     // Remove the parameters in the url
-    urlParams.searchParams.delete('redirect');
-    window.history.pushState(null, 'redirect', urlParams.href);
+    if (redirect) {
+      urlParams.searchParams.delete('redirect');
+      window.history.replaceState(null, 'redirect', urlParams.href);
+    } else {
+      return '/dashboard/analysis';
+    }
     return redirect;
   }
   handleMenuCollapse = (collapsed) => {
diff --git a/src/models/login.js b/src/models/login.js
index 044b264d576894f18c38f592edc246234268cf9b..5efd5f19fdb18a714b031de73b9f4a6706e50d87 100644
--- a/src/models/login.js
+++ b/src/models/login.js
@@ -31,7 +31,7 @@ export default {
         const pathname = yield select(state => state.routing.location.pathname);
         // add the parameters in the url
         urlParams.searchParams.set('redirect', pathname);
-        window.history.pushState(null, 'login', urlParams.href);
+        window.history.replaceState(null, 'login', urlParams.href);
       } finally {
         // yield put(routerRedux.push('/user/login'));
         // Login out after permission changes to admin or user