Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-ui/src/router/index.js
This commit is contained in:
疯狂的狮子li
2021-07-24 19:03:36 +08:00
4 changed files with 16 additions and 6 deletions

View File

@ -64,6 +64,7 @@ service.interceptors.response.use(res => {
location.href = '/index';
})
}).catch(() => {});
return Promise.reject('error')
} else if (code === 500) {
Message({
message: msg,