登录使用replace，登出携带redirect for #1728

src/models/login.js

@@ -31,18 +31,10 @@ export default {
             return;
           }
         }
-        yield put(routerRedux.push(redirect || '/'));
+        yield put(routerRedux.replace(redirect || '/'));
       }
     },
-    *logout(_, { put, select }) {
-      try {
-        // get location pathname
-        const urlParams = new URL(window.location.href);
-        const pathname = yield select(state => state.routing.location.pathname);
-        // add the parameters in the url
-        urlParams.searchParams.set('redirect', pathname);
-        window.history.replaceState(null, 'login', urlParams.href);
-      } finally {
+    *logout(_, { put }) {
       yield put({
         type: 'changeLoginStatus',
         payload: {
@@ -51,8 +43,9 @@ export default {
         },
       });
       reloadAuthorized();
-        yield put(routerRedux.push('/user/login'));
-      }
+      yield put(
+        routerRedux.push(`/user/login?redirect=${encodeURIComponent(window.location.href)}`)
+      );
     },
   },