diff --git a/src/Login.vue b/src/Login.vue index aa21d1e8..2bdf1a09 100644 --- a/src/Login.vue +++ b/src/Login.vue @@ -86,21 +86,17 @@ export default { localStorage.setItem(storageKey.userId, res.data.data.user.id) localStorage.setItem(storageKey.token, res.data.data.token) this.$i18n.locale = localStorage.getItem(storageKey.language) - } else if (res.data.code === 518005) { - this.$message.error(this.$t('Incorrect username or password')) - this.loading = false - this.blockOperation.query = false - } else { - this.$message.error('Unknown error') - this.loading = false - this.blockOperation.query = false } } ).catch(e => { console.error(e) this.loading = false this.blockOperation.query = false - this.$message.error(this.errorMsgHandler(e)) + if (_.get(e, 'response.data.code', 0) === 518005) { + this.$message.error(this.$t('Incorrect username or password')) + } else { + this.$message.error(this.errorMsgHandler(e)) + } }) }, queryAppearance () { diff --git a/src/components/rightBox/settings/UserBox.vue b/src/components/rightBox/settings/UserBox.vue index a3890fc2..b45208ff 100644 --- a/src/components/rightBox/settings/UserBox.vue +++ b/src/components/rightBox/settings/UserBox.vue @@ -266,8 +266,13 @@ export default { } }).catch((err) => { this.blockOperation.save = false - let errMsg = err.response ? err.response : (err.message ? err.message : err.toString()) - this.$message.error(_.get(errMsg, 'data.message', [])) + if (_.get(err, 'response.data.code') === 511036) { + // TODO 改成国际化 + this.$message.error('This login name is already in use') + } else { + const errMsg = err.response ? err.response : (err.message ? err.message : err.toString()) + this.$message.error(_.get(errMsg, 'data.message', [])) + } }) } } else { diff --git a/src/mixins/table.js b/src/mixins/table.js index 8a6cd158..db396b7e 100644 --- a/src/mixins/table.js +++ b/src/mixins/table.js @@ -108,7 +108,6 @@ export default { changeStatus (status, id) { if (id) { axios.patch(api.knowledgeBaseEnable, { list: [{ knowledgeId: id, status: status }] }).then(response => { - console.info(response) if (response.status === 200) { this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') }) } else { diff --git a/src/utils/http.js b/src/utils/http.js index eca9d4ef..1fa6e9a4 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -1,6 +1,7 @@ import axios from 'axios' import { storageKey } from '@/utils/constants' import store from '@/store' +import _ from 'lodash' const CancelToken = axios.CancelToken @@ -59,23 +60,18 @@ axios.interceptors.request.use( ) axios.interceptors.response.use( response => { - if (licenceErrorCode.indexOf(response.data.code) !== -1) { - localStorage.removeItem(storageKey.token) - window.location.href = '/' - } else if (accountErrorCode.indexOf(response.data.code) !== -1) { - localStorage.removeItem(storageKey.token) - window.location.href = '/' - } return response }, error => { try { - if (error.response && licenceErrorCode.indexOf(error.response.data.code) !== -1) { - localStorage.removeItem(storageKey.token) - window.location.href = '/' - } else if (error.response && accountErrorCode.indexOf(error.response.data.code) !== -1) { - localStorage.removeItem(storageKey.token) - window.location.href = '/' + if (_.get(error, 'response.config.url') !== '/sys/login') { + if (error.response && licenceErrorCode.indexOf(error.response.data.code) !== -1) { + localStorage.removeItem(storageKey.token) + window.location.href = '/' + } else if (error.response && accountErrorCode.indexOf(error.response.data.code) !== -1) { + localStorage.removeItem(storageKey.token) + window.location.href = '/' + } } } catch (e) { console.error(e) diff --git a/src/views/entityExplorer/EntityGraph.vue b/src/views/entityExplorer/EntityGraph.vue index 39ca06e8..a5188059 100644 --- a/src/views/entityExplorer/EntityGraph.vue +++ b/src/views/entityExplorer/EntityGraph.vue @@ -1073,7 +1073,6 @@ export default { if (n) { if (n.undo.length > 0) { document.getElementById('preStep').classList.remove('toolbar--unactivated') - console.info(n, document.getElementById('preStep').classList) } else { document.getElementById('preStep').classList.add('toolbar--unactivated') } diff --git a/src/views/setting/KnowledgeBase.vue b/src/views/setting/KnowledgeBase.vue index 42716d05..6ff7e41b 100644 --- a/src/views/setting/KnowledgeBase.vue +++ b/src/views/setting/KnowledgeBase.vue @@ -298,7 +298,6 @@ export default { axios.get(`${this.url}/${u.id}`).then(response => { if (response.status === 200) { this.object = response.data.data.list[0] - console.info(this.object) } }).catch(e => { console.error(e)