添加request2方式请求两个服务器

This commit is contained in:
junleea 2024-09-27 20:58:39 +08:00
parent 3c22ca29a8
commit 3921d1f91e
10 changed files with 82 additions and 25 deletions

View File

@ -1,4 +1,6 @@
import request from '@/utils/request.js'
import { request, request2 } from '@/utils/request.js';
export const getFriendListService = (data) => { export const getFriendListService = (data) => {
const params = new URLSearchParams(); const params = new URLSearchParams();

View File

@ -1,4 +1,5 @@
import request from '@/utils/request.js'
import { request, request2 } from '@/utils/request.js';
export const runCIDService = (data) => { export const runCIDService = (data) => {
const params = new URLSearchParams(); const params = new URLSearchParams();

View File

@ -1,11 +1,12 @@
import request from '@/utils/request.js'
import { request, request2 } from '@/utils/request.js';
export const restartDeviceService = (data) => { export const restartDeviceService = (data) => {
const params = new URLSearchParams(); const params = new URLSearchParams();
for (let key in data) { for (let key in data) {
params.append(key, data[key]) 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) => { export const updateDeviceService = (data) => {
@ -13,7 +14,7 @@ export const updateDeviceService = (data) => {
for (let key in data) { for (let key in data) {
params.append(key, data[key]) 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) => { export const deleteDeviceService = (data) => {
@ -21,7 +22,7 @@ export const deleteDeviceService = (data) => {
for (let key in data) { for (let key in data) {
params.append(key, data[key]) 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) => { export const addDeviceService = (data) => {
@ -29,7 +30,7 @@ export const addDeviceService = (data) => {
for (let key in data) { for (let key in data) {
params.append(key, data[key]) 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) => { export const getDeviceListService = (data) => {
@ -38,8 +39,8 @@ export const getDeviceListService = (data) => {
params.append(d, data[d]); params.append(d, data[d]);
} }
// request.headers["Content-Type"] = "application/json"; // request.headers["Content-Type"] = "application/json";
request.defaults.headers["token"] = data.token.value; request2.defaults.headers["token"] = data.token.value;
return request.post('/device/get_device_list', params, { return request2.post('/device/get_device_list', params, {
headers: { headers: {
'token': data.token, // 将 token 替换为您的令牌值 'token': data.token, // 将 token 替换为您的令牌值
} }

View File

@ -1,5 +1,4 @@
import request from '@/utils/request.js' import { request, request2 } from '@/utils/request.js';
export const updateDeviceService = (data) => { export const updateDeviceService = (data) => {

View File

@ -1,4 +1,4 @@
import request from '@/utils/request.js' import { request, request2 } from '@/utils/request.js';
export const getImKeyService = (Data) => { export const getImKeyService = (Data) => {
const params = new URLSearchParams(); const params = new URLSearchParams();

View File

@ -1,4 +1,4 @@
import request from '@/utils/request.js' import { request, request2 } from '@/utils/request.js';
import md5 from 'js-md5'; import md5 from 'js-md5';
export const loginService = (loginData) => { export const loginService = (loginData) => {

View File

@ -1,18 +1,20 @@
import request from '@/utils/request.js'
import { request, request2 } from '@/utils/request.js';
export const playVideoService = (data) => { export const playVideoService = (data) => {
const params = new URLSearchParams(); const params = new URLSearchParams();
for (let key in data) { for (let key in data) {
params.append(key, data[key]) 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) => { export const delayVideoService = (data) => {
const params = new URLSearchParams(); const params = new URLSearchParams();
for (let key in data) { for (let key in data) {
params.append(key, data[key]) 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) => { export const quashVideoService = (data) => {
@ -20,7 +22,7 @@ export const quashVideoService = (data) => {
for (let key in data) { for (let key in data) {
params.append(key, data[key]) 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) { function getTimeString(time) {
let date = new Date(time); let date = new Date(time);
@ -64,8 +66,8 @@ export const getVideoListService = (data) => {
params.append(key, data[key]) params.append(key, data[key])
} }
// request.headers["Content-Type"] = "application/json"; // request.headers["Content-Type"] = "application/json";
request.defaults.headers["token"] = data.token.value; request2.defaults.headers["token"] = data.token.value;
return request.post('/video/get_video_list', params, { return request2.post('/video/get_video_list', params, {
headers: { headers: {
'token': data.token, // 将 token 替换为您的令牌值 'token': data.token, // 将 token 替换为您的令牌值
} }

View File

@ -1,18 +1,23 @@
import axios from "axios"; import axios from "axios";
import router from "@/router/index.js"; import router from "@/router/index.js";
const baseURL = "https://gep.ljsea.xyz/"; //const baseURL = "https://gep.ljsea.xyz/";
//const baseURL= "http://localhost:8083"; //const baseURL= "http://localhost:8083";
//const baseURL="https://pm.ljsea.top"; //const baseURL="https://pm.ljsea.top";
const baseURL = "https://tx.ljsea.top/";
const baseURL2 = "https://gs.ljsea.top/";
const request = axios.create({ const request = axios.create({
baseURL: baseURL, baseURL: baseURL,
}); });
const request2 = axios.create({
baseURL: baseURL2,
});
request.interceptors.response.use( request.interceptors.response.use(
result => { result => {
if(result.status!==200 ){ if(result.status!==200 ){
router.push("/login") router.push("/login")
} }
if(result.data.message==="NOT_LOGIN"||result.data.code==2 || result.data.code ===3 ||result.data.code ===4){ if(result.data.message==="NOT_LOGIN"|| [2, 3, 4].includes(result.data.code)){
alert("登录失效,请重新登录!") alert("登录失效,请重新登录!")
localStorage.removeItem("token"); localStorage.removeItem("token");
router.push("/login") router.push("/login")
@ -35,6 +40,37 @@ request.interceptors.response.use(
} }
) )
request.interceptors.request.use( request.interceptors.request.use(
) )
export default request;
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("登录失效,请重新登录!")
localStorage.removeItem("token");
router.push("/login")
return
}
if(result.data.code == 7){
alert("该用户已存在,请重新输入!");
return null
}
if(result.data.code == 1){
alert("请求失败,请稍后重试!");
}else{
return result.data
}
},
error => {
alert("请求失败,请稍后重试!");
return Promise.reject(error);
}
)
request2.interceptors.request.use()
export { request, request2 };

View File

@ -142,6 +142,7 @@ export default {
data() { data() {
return { return {
ip: "", ip: "",
wss : "wss://tx.ljsea.top",
tableData: [], tableData: [],
tokenData: { tokenData: {
token: localStorage.getItem("token"), token: localStorage.getItem("token"),
@ -163,6 +164,7 @@ export default {
eventSource: null, // eventSource: null, //
uid: localStorage.getItem("userId"), uid: localStorage.getItem("userId"),
currentMsg:"", currentMsg:"",
socket: null,
MsgList: [], MsgList: [],
groupList: [], groupList: [],
hasUnreadMsg: {}, // , keyidvaluetrue/false hasUnreadMsg: {}, // , keyidvaluetrue/false
@ -321,7 +323,7 @@ export default {
} else { } else {
console.log("浏览器支持WebSocket"); console.log("浏览器支持WebSocket");
let socketUrl = let socketUrl =
"wss://gep.ljsea.xyz/im/ws_v2?to_user_id=" + this.wss + "/im/ws_v2?to_user_id=" +
this.to_user_id + this.to_user_id +
"&token=" + "&token=" +
this.tokenData.token; this.tokenData.token;
@ -486,6 +488,10 @@ export default {
} }
}, },
handleMenuSelect(val) { handleMenuSelect(val) {
if (this.socket) {
this.socket.close();
this.socket = null;
}
router.push(val); router.push(val);
}, },
toVideoList() { toVideoList() {
@ -519,9 +525,14 @@ export default {
this.handleGetMessage(this.userList[0].id); this.handleGetMessage(this.userList[0].id);
}, },
onUnmounted() { onUnmounted() {
console.log("unmounted");
if (this.eventSource) { if (this.eventSource) {
this.eventSource.close(); this.eventSource.close();
} }
if (this.socket) {
this.socket.close();
this.socket = null;
}
}, },
}; };
</script> </script>

View File

@ -67,6 +67,7 @@ export default {
users: [{ username: "admin" }, { username: "zhang" }], users: [{ username: "admin" }, { username: "zhang" }],
chatUser: "2002", chatUser: "2002",
text: "", text: "",
wss : "wss://ls.ljsea.top",
messages: [], messages: [],
session: "", session: "",
loading: ref(true), loading: ref(true),
@ -121,6 +122,10 @@ export default {
}, 1000); // 1000 }, 1000); // 1000
}, },
handleMenuSelect(val) { handleMenuSelect(val) {
if (this.socket) {
this.socket.close();
this.socket = null;
}
router.push(val); router.push(val);
}, },
stopInterval() { stopInterval() {
@ -278,7 +283,7 @@ export default {
} else { } else {
console.log("浏览器支持WebSocket"); console.log("浏览器支持WebSocket");
let socketUrl = let socketUrl =
"wss://gep.ljsea.xyz/im/ws?to_user_id=" + this.wss+"/im/ws?to_user_id=" +
this.to_user_id + this.to_user_id +
"&token=" + "&token=" +
this.tokenData.token; this.tokenData.token;