diff --git a/src/api/cid.js b/src/api/cid.js index 9c0d6fa..20b130a 100644 --- a/src/api/cid.js +++ b/src/api/cid.js @@ -1,5 +1,6 @@ import request from '@/utils/request.js' import request2 from '@/utils/gs_req.js'; +import request_aliyun from '@/utils/aliyun_erver.js'; export const runCIDService = (data) => { const params = new URLSearchParams(); @@ -77,7 +78,9 @@ function getRequest() { let request1 = null; if (server === "tx.ljsea.top") { request1 = request; - } else { + } else if (server === "js.ljsea.top") { + request1 = request_aliyun; + }else{ request1 = request2; } return request1; diff --git a/src/api/file.js b/src/api/file.js index 2fc7107..50ea96c 100644 --- a/src/api/file.js +++ b/src/api/file.js @@ -1,6 +1,6 @@ import request from '@/utils/request.js' import request2 from '@/utils/gs_req.js'; - +import request_aliyun from '@/utils/aliyun_erver.js'; export const updateConfigFileService = (data) => { @@ -46,12 +46,25 @@ export const getConfigFileListService = (data) => { ); } +// function getRequest() { +// let server = localStorage.getItem('config_file_server'); +// let request1 = null; +// if (server === "tx.ljsea.top") { +// request1 = request; +// } else { +// request1 = request2; +// } +// return request1; +// } + function getRequest() { let server = localStorage.getItem('config_file_server'); let request1 = null; if (server === "tx.ljsea.top") { request1 = request; - } else { + } else if (server === "js.ljsea.top") { + request1 = request_aliyun; + }else{ request1 = request2; } return request1; diff --git a/src/utils/aliyun_erver.js b/src/utils/aliyun_erver.js new file mode 100644 index 0000000..fc017b6 --- /dev/null +++ b/src/utils/aliyun_erver.js @@ -0,0 +1,46 @@ +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://js.ljsea.top/"; +const request_aliyun = axios.create({ + baseURL: baseURL2, +}); + + + +request_aliyun.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); + } +) + +export default request_aliyun; \ No newline at end of file diff --git a/src/views/CIDList.vue b/src/views/CIDList.vue index 763f6db..91275af 100644 --- a/src/views/CIDList.vue +++ b/src/views/CIDList.vue @@ -146,6 +146,7 @@ export default { if (result.code == 0) { //alert("添加成功"); ElMessage.success("添加成功"); + this.getDeviceList() } else { //alert("添加失败"); ElMessage.error("添加失败"); @@ -245,6 +246,7 @@ export default { gep.ljsea.xyz tx.ljsea.top + 阿里云新加坡 diff --git a/src/views/CIDLog.vue b/src/views/CIDLog.vue index e1bd700..b6fc678 100644 --- a/src/views/CIDLog.vue +++ b/src/views/CIDLog.vue @@ -113,6 +113,7 @@ export default { this.updateForm.script = this.tableData[index].Script; this.updateForm.end = this.tableData[index].Log; this.updateForm.error = this.tableData[index].Error; + this.updateForm.RunTime = this.tableData[index].RunTime; }, async getIpClient() { try { @@ -196,16 +197,29 @@ export default { autocomplete="on" style="width: 600px" > + + + + + + - + - + - - + + + + + -