From 057ae3406bc431f08c64844dc80b80e977dad870 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Fri, 29 May 2020 19:00:17 +0800
Subject: [PATCH 1/2] ''

---
 frontend/src/common/js/ajax.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/common/js/ajax.js b/frontend/src/common/js/ajax.js
index 1013b80008..e20ab833f6 100644
--- a/frontend/src/common/js/ajax.js
+++ b/frontend/src/common/js/ajax.js
@@ -14,12 +14,12 @@ export default {
     }
 
     let login = function () {
-      MessageBox.alert(this.$t('commons.tips'), {
+      MessageBox.alert("The authentication information has expired, please login again", "Prompt", {
         callback: () => {
           window.location.href = "/login"
         }
       }).then(r => {
-
+        window.location.href = "/login"
       });
     };
 
@@ -53,7 +53,7 @@ export default {
       }
       result.loading = false;
       window.console.error(error.response || error.message);
-      if (error.response.data) {
+      if (!error.response.data) {
         Message.error({message: error.response.data.message, showClose: true});
       } else {
         Message.error({message: error.message, showClose: true});

From 806fe04fa152c6b55a0294eb7bf7e91bb08a1b82 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Mon, 1 Jun 2020 11:46:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dlang=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/common/head/LanguageSwitch.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/business/components/common/head/LanguageSwitch.vue b/frontend/src/business/components/common/head/LanguageSwitch.vue
index 3b662550b0..de8e1f5e3b 100644
--- a/frontend/src/business/components/common/head/LanguageSwitch.vue
+++ b/frontend/src/business/components/common/head/LanguageSwitch.vue
@@ -44,6 +44,7 @@
     },
     methods: {
       checkLanguage(lang) {
+        if (!lang) return;
         this.$setLang(lang);
         switch (lang) {
           case ZH_CN: