Merge branch 'dev' of https://github.com/metersphere/server into dev

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:

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});