diff --git a/src/utils/config.js b/src/utils/config.js index 0aa94b71fb327082a00561a20ab52adf5e92301b..d91a4482e99638e309a82b17c765dcc9c9f7f912 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -2,6 +2,6 @@ module.exports = { // baseUrl: 'localhost:2011' // baseUrl: '49.234.81.196:2011' // baseUrl: '120.25.106.20:2011' - // baseUrl: 'localhost:40000' - baseUrl: '192.168.0.107:2011' + baseUrl: 'localhost:40000' + // baseUrl: '192.168.0.107:2011' } diff --git a/src/utils/http.js b/src/utils/http.js index 13c8ec616d1ca2ea1ce4be7417b2fd4c576ef5e2..2e2e0aa0c3da2ade499db284b83397170547f9be 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -74,6 +74,7 @@ export function putRequest(url, params) { export function deleteRequest(url, params) { return http.delete(url, params) } +// 下载请求 export function download(url, params) { return http.download(url, params) } diff --git a/src/utils/request.js b/src/utils/request.js index 59a251df3edfdb41700fa94ca8b7b2bc04f7f467..51aca45d88442cdf6b3fd71f40f26c63c3857961 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -54,7 +54,7 @@ service.interceptors.response.use(success => { } else if (error.response.data.message) { Message.error({ message: error.response.data.message }) } else { - Message.error({ message: '未知错误' }) + Message.error({ message: '后台正在启动中,请稍后再试' }) } }) diff --git a/src/utils/websocket_service.js b/src/utils/websocket_service.js index dea5f27d716e316a273531dd8a60039147ceb5e7..b79fc3e56bd3695300e5ccd35169d8de2beb8c41 100644 --- a/src/utils/websocket_service.js +++ b/src/utils/websocket_service.js @@ -16,6 +16,8 @@ ws = null // 存储回调函数 callBackMapping = {} +ipAddress = JSON.parse(localStorage.getItem('ipAddress')) + // 标识是否连接成功 connected = false @@ -32,7 +34,7 @@ connect() { /* if (!Window.WebSocket) { return console.log('您的浏览器不支持WebSocket') } */ - this.ws = new WebSocket(`ws://${baseUrl}/WebSocket/${window.localStorage.getItem('staffNumber')}`) // Websocket ip+端口 + this.ws = new WebSocket('ws://' + this.ipAddress + `:40000/WebSocket/${window.localStorage.getItem('staffNumber')}`) // Websocket ip+端口 // 连接成功 this.ws.onopen = () => { // Message.success('WebSocket连接成功') diff --git a/src/views/Login.vue b/src/views/Login.vue index c37db3ee0c21efd542fdfbccec1750423dea89ff..8d8a2ea824cc3b78524e1bab530c3c473b8a3170 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -1,13 +1,6 @@