From 260bd5a5d91b0109436a03f236538fa23fe2fdb8 Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Wed, 2 Oct 2024 18:16:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E6=9C=8D=E5=8A=A1=E5=99=A8=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E8=A7=86=E9=A2=91=E3=80=81=E8=AE=BE=E5=A4=87?= =?UTF-8?q?ipv6=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device.js | 14 +++++------ src/api/video.js | 12 +++++----- src/utils/gs_req.js | 48 ++++++++++++++++++++++++++++++++++++++ src/utils/request.js | 17 +++++++++----- src/views/Chat.vue | 2 +- src/views/DeviceRealVP.vue | 4 ---- src/views/Im.vue | 2 +- 7 files changed, 74 insertions(+), 25 deletions(-) create mode 100644 src/utils/gs_req.js diff --git a/src/api/device.js b/src/api/device.js index b45e29c..7d1688e 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -1,11 +1,11 @@ -import request from '@/utils/request.js' +import request2 from '@/utils/gs_req.js'; export const restartDeviceService = (data) => { const params = new URLSearchParams(); for (let key in data) { params.append(key, data[key]) } - return request.post('/device/restart', params, { "headers": { 'token': data.token } }); + return request2.post('/device/restart', params, { "headers": { 'token': data.token } }); } export const updateDeviceService = (data) => { @@ -13,7 +13,7 @@ export const updateDeviceService = (data) => { for (let key in data) { params.append(key, data[key]) } - return request.post('/device/update_device', params, { "headers": { 'token': data.token } }); + return request2.post('/device/update_device', params, { "headers": { 'token': data.token } }); } export const deleteDeviceService = (data) => { @@ -21,7 +21,7 @@ export const deleteDeviceService = (data) => { for (let key in data) { params.append(key, data[key]) } - return request.post('/device/delete_device', params, { "headers": { 'token': data.token } }); + return request2.post('/device/delete_device', params, { "headers": { 'token': data.token } }); } export const addDeviceService = (data) => { @@ -29,7 +29,7 @@ export const addDeviceService = (data) => { for (let key in data) { params.append(key, data[key]) } - return request.post('/device/add_device', params, { "headers": { 'token': data.token },'Content-Type': 'application/json' }); + return request2.post('/device/add_device', params, { "headers": { 'token': data.token },'Content-Type': 'application/json' }); } export const getDeviceListService = (data) => { @@ -38,8 +38,8 @@ export const getDeviceListService = (data) => { params.append(d, data[d]); } // request.headers["Content-Type"] = "application/json"; - request.defaults.headers["token"] = data.token.value; - return request.post('/device/get_device_list', params, { + request2.defaults.headers["token"] = data.token.value; + return request2.post('/device/get_device_list', params, { headers: { 'token': data.token, // 将 token 替换为您的令牌值 } diff --git a/src/api/video.js b/src/api/video.js index 7452818..3089fda 100644 --- a/src/api/video.js +++ b/src/api/video.js @@ -1,18 +1,18 @@ -import request from '@/utils/request.js' +import request2 from '@/utils/gs_req.js'; export const playVideoService = (data) => { const params = new URLSearchParams(); for (let key in data) { params.append(key, data[key]) } - return request.post('/video', params, Headers = { 'Accept': 'application/vnd.apple.mpegurl','token': data.token }); + return request2.post('/video', params, Headers = { 'Accept': 'application/vnd.apple.mpegurl','token': data.token }); } export const delayVideoService = (data) => { const params = new URLSearchParams(); for (let key in data) { params.append(key, data[key]) } - return request.post('/video/delay', params, { headers : {'token': data.token }}); + return request2.post('/video/delay', params, { headers : {'token': data.token }}); } export const quashVideoService = (data) => { @@ -20,7 +20,7 @@ export const quashVideoService = (data) => { for (let key in data) { params.append(key, data[key]) } - return request.post('/video/quash_option', params, { headers : {'token': data.token }}); + return request2.post('/video/quash_option', params, { headers : {'token': data.token }}); } function getTimeString(time) { let date = new Date(time); @@ -64,8 +64,8 @@ export const getVideoListService = (data) => { params.append(key, data[key]) } // request.headers["Content-Type"] = "application/json"; - request.defaults.headers["token"] = data.token.value; - return request.post('/video/get_video_list', params, { + request2.defaults.headers["token"] = data.token.value; + return request2.post('/video/get_video_list', params, { headers: { 'token': data.token, // 将 token 替换为您的令牌值 } diff --git a/src/utils/gs_req.js b/src/utils/gs_req.js new file mode 100644 index 0000000..0b0ed53 --- /dev/null +++ b/src/utils/gs_req.js @@ -0,0 +1,48 @@ +import axios from "axios"; +import router from "@/router/index.js"; +import { ElMessage } from 'element-plus'; +//const baseURL = "https://gep.ljsea.xyz/"; +//const baseURL= "http://localhost:8083"; +//const baseURL="https://pm.ljsea.top"; +const baseURL2 = "https://gep.ljsea.xyz/"; +const request2 = axios.create({ + baseURL: baseURL2, +}); + + + +request2.interceptors.response.use( + result => { + if(result.status!==200 ){ + router.push("/login") + } + if(result.data.message==="NOT_LOGIN"|| [2, 3, 4].includes(result.data.code)){ + //alert("登录失效，请重新登录！") + ElMessage.error('登录失效，请重新登录！'); + localStorage.removeItem("token"); + router.push("/login") + return + } + if(result.data.code == 7){ + //alert("该用户已存在，请重新输入！"); + ElMessage.error('该用户已存在，请重新输入！'); + return null + } + + if(result.data.code == 1){ + //alert("请求失败，请稍后重试！"); + ElMessage.error('请求失败，请稍后重试！'); + }else{ + return result.data + } + }, + error => { + //alert("请求失败，请稍后重试！"); + ElMessage.error('请求失败，请稍后重试！'); + return Promise.reject(error); + } +) +request2.interceptors.request.use() + + +export default request2; \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 8c11b7d..ec6b994 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,6 +1,7 @@ import axios from "axios"; import router from "@/router/index.js"; -const baseURL = "https://gep.ljsea.xyz/"; +//const baseURL = "https://gep.ljsea.xyz/"; +const baseURL = "https://tx.ljsea.top/"; //const baseURL= "http://localhost:8083"; //const baseURL="https://pm.ljsea.top"; const request = axios.create({ @@ -12,25 +13,29 @@ request.interceptors.response.use( if(result.status!==200 ){ router.push("/login") } - if(result.data.message==="NOT_LOGIN"||result.data.code==2 || result.data.code ===3 ||result.data.code ===4){ - alert("登录失效，请重新登录！") + if(result.data.message==="NOT_LOGIN"|| [2, 3, 4].includes(result.data.code)){ + //alert("登录失效，请重新登录！") + ElMessage.error('登录失效，请重新登录！'); localStorage.removeItem("token"); router.push("/login") return } if(result.data.code == 7){ - alert("该用户已存在，请重新输入！"); + //alert("该用户已存在，请重新输入！"); + ElMessage.error('该用户已存在，请重新输入！'); return null } if(result.data.code == 1){ - alert("请求失败，请稍后重试！"); + //alert("请求失败，请稍后重试！"); + ElMessage.error('请求失败，请稍后重试！'); }else{ return result.data } }, error => { - alert("请求失败，请稍后重试！"); + //alert("请求失败，请稍后重试！"); + ElMessage.error('请求失败，请稍后重试！'); return Promise.reject(error); } ) diff --git a/src/views/Chat.vue b/src/views/Chat.vue index 2fa6d01..238c79e 100644 --- a/src/views/Chat.vue +++ b/src/views/Chat.vue @@ -321,7 +321,7 @@ export default { } else { console.log("浏览器支持WebSocket"); let socketUrl = - "wss://gep.ljsea.xyz/im/ws_v2?to_user_id=" + + "wss://tx.ljsea.top/im/ws_v2?to_user_id=" + this.to_user_id + "&token=" + this.tokenData.token; diff --git a/src/views/DeviceRealVP.vue b/src/views/DeviceRealVP.vue index afce332..b286749 100644 --- a/src/views/DeviceRealVP.vue +++ b/src/views/DeviceRealVP.vue @@ -83,10 +83,6 @@ export default { _this.base64Image = 'data:image/png;base64,'+data.data // console.log("收到数据====" + msg.data); - } else if (data.type == "offline") { - alert("对方已下线"); - _this.socket.close(); - router.push("/user"); } }; } diff --git a/src/views/Im.vue b/src/views/Im.vue index 2c3dddc..9e05ea9 100644 --- a/src/views/Im.vue +++ b/src/views/Im.vue @@ -278,7 +278,7 @@ export default { } else { console.log("浏览器支持WebSocket"); let socketUrl = - "wss://gep.ljsea.xyz/im/ws?to_user_id=" + + "wss://tx.ljsea.top/im/ws?to_user_id=" + this.to_user_id + "&token=" + this.tokenData.token;