Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-11-17 81d04fb31f234409229b9e96b5329020cd499f25

 ruoyi-ui/src/utils/request.js

@@ -65,7 +65,7 @@
        }
      ).then(() => {
        store.dispatch('LogOut').then(() => {
          location.href = '/index';
          location.href = process.env.VUE_APP_CONTEXT_PATH + "index";
        })
      }).catch(() => {});
      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')