fix: mock login 200 httpstatus

sendya · sendya · commit 5d44c0cf9ff1 · 2019-04-10T21:20:21.000+08:00
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "lodash.get": "^4.4.2",
     "lodash.pick": "^4.4.0",
     "md5": "^2.2.1",
-    "mockjs2": "^1.0.2",
+    "mockjs2": "^1.0.5",
     "moment": "^2.24.0",
     "nprogress": "^0.2.0",
     "viser-vue": "^2.3.3",
diff --git a/src/mock/services/auth.js b/src/mock/services/auth.js
@@ -8,7 +8,7 @@ const login = (options) => {
   const body = getBody(options)
   console.log('mock: body', body)
   if (!username.includes(body.username) || !password.includes(body.password)) {
-    return builder({}, '账户或密码错误', 401)
+    return builder({ isLogin: true }, '账户或密码错误', 401)
   }
 
   return builder({
diff --git a/src/utils/request.js b/src/utils/request.js
@@ -25,7 +25,7 @@ const err = (error) => {
         description: data.message
       })
     }
-    if (error.response.status === 401) {
+    if (error.response.status === 401 && !(data.result && data.result.isLogin)) {
       notification.error({
         message: 'Unauthorized',
         description: 'Authorization verification failed'
diff --git a/yarn.lock b/yarn.lock
@@ -7190,10 +7190,10 @@ mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@
   dependencies:
     minimist "0.0.8"
 
-mockjs2@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/mockjs2/-/mockjs2-1.0.2.tgz#419707a03cf5852c8e9ce37acb0f44ef8ee06fc6"
-  integrity sha512-O2xujQxSQ526TGtz0kUQTfFln+0V085r4mcms1aMKCmnoSW704N46BbIIwpY1DJmLuDOHJasYtfN1wwOUeA2Ow==
+mockjs2@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/mockjs2/-/mockjs2-1.0.5.tgz#be80f670e0468092b15454169591e936c3bd29f9"
+  integrity sha512-2RPYSxVuIsmV0S8FwUh2srTm+K1EWr57GyUgjA5+6H49ZwqtFUlRfZAVJNYwKtswxehP4FDTsfuCRMd290bFTA==
   dependencies:
     commander "*"
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ const login = (options) => {`
`8`	`8`	`const body = getBody(options)`
`9`	`9`	`console.log('mock: body', body)`
`10`	`10`	`if (!username.includes(body.username) \|\| !password.includes(body.password)) {`
`11`		`- return builder({}, '账户或密码错误', 401)`
	`11`	`+ return builder({ isLogin: true }, '账户或密码错误', 401)`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`return builder({`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ const err = (error) => {`
`25`	`25`	`description: data.message`
`26`	`26`	`})`
`27`	`27`	`}`
`28`		`- if (error.response.status === 401) {`
	`28`	`+ if (error.response.status === 401 && !(data.result && data.result.isLogin)) {`
`29`	`29`	`notification.error({`
`30`	`30`	`message: 'Unauthorized',`
`31`	`31`	`description: 'Authorization verification failed'`