From 9a1df9f4034d395cb2d1a933cb73d388391a19a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?chencheng=20=28=E4=BA=91=E8=B0=A6=29?= <sorrycc@gmail.com>
Date: Wed, 11 Dec 2019 18:13:37 +0800
Subject: [PATCH] dep: upgrade dva to 2.6.0-beta.16, fix warning (#5534)

* dep: upgrade dva to 2.6.0-beta.16, fix warning

* lint: fix eslint error

* lint: fix eslint error

* doc: add security comment
---
 package.json        |  2 +-
 src/models/login.ts | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 264d466d..cfd25608 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "@antv/data-set": "^0.10.2",
     "antd": "^3.23.6",
     "classnames": "^2.2.6",
-    "dva": "^2.4.1",
+    "dva": "^2.6.0-beta.16",
     "lodash": "^4.17.11",
     "moment": "^2.24.0",
     "omit.js": "^1.0.2",
diff --git a/src/models/login.ts b/src/models/login.ts
index 656902df..ff5d0f1c 100644
--- a/src/models/login.ts
+++ b/src/models/login.ts
@@ -1,7 +1,7 @@
 import { Reducer } from 'redux';
-import { routerRedux } from 'dva/router';
 import { Effect } from 'dva';
 import { stringify } from 'querystring';
+import router from 'umi/router';
 
 import { fakeAccountLogin, getFakeCaptcha } from '@/services/login';
 import { setAuthority } from '@/utils/authority';
@@ -57,25 +57,24 @@ const Model: LoginModelType = {
             return;
           }
         }
-        yield put(routerRedux.replace(redirect || '/'));
+        router.replace(redirect || '/');
       }
     },
 
     *getCaptcha({ payload }, { call }) {
       yield call(getFakeCaptcha, payload);
     },
-    *logout(_, { put }) {
+
+    logout() {
       const { redirect } = getPageQuery();
-      // redirect
+      // Note: There may be security issues, please note
       if (window.location.pathname !== '/user/login' && !redirect) {
-        yield put(
-          routerRedux.replace({
-            pathname: '/user/login',
-            search: stringify({
-              redirect: window.location.href,
-            }),
+        router.replace({
+          pathname: '/user/login',
+          search: stringify({
+            redirect: window.location.href,
           }),
-        );
+        });
       }
     },
   },