From a69192c80e04cc0af14590b86fb9b6e52b7dd9cb Mon Sep 17 00:00:00 2001 From: RogerWork Date: Thu, 2 Jan 2025 13:38:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E7=BB=84=E7=BB=87=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/update/CinemaUpdate.vue | 2 +- src/env_config.js | 3 + src/request/config.js | 16 ---- src/request/dev.js | 11 +++ src/request/index.js | 101 ++++++++++++++----------- src/request/prd.js | 24 ++++++ 6 files changed, 94 insertions(+), 63 deletions(-) create mode 100644 src/env_config.js delete mode 100644 src/request/config.js create mode 100644 src/request/dev.js create mode 100644 src/request/prd.js diff --git a/src/components/update/CinemaUpdate.vue b/src/components/update/CinemaUpdate.vue index c4d4ded..7100cee 100644 --- a/src/components/update/CinemaUpdate.vue +++ b/src/components/update/CinemaUpdate.vue @@ -3,7 +3,7 @@ import {onBeforeMount, ref, computed} from "vue"; import {useStore} from "vuex"; import {get_git_ver, get_update_alter, get_update_option, handle_update} from "@/apis/update.js" import Tips from "@/components/update/Tips.vue" -import config from "@/request/config.js" +import config from "@/request/prd.js" import ProcessIcon from "@/components/update/ProcessIcon.vue"; import {ElMessageBox} from "element-plus"; diff --git a/src/env_config.js b/src/env_config.js new file mode 100644 index 0000000..7800646 --- /dev/null +++ b/src/env_config.js @@ -0,0 +1,3 @@ +export default function env_config() { + return 'dev' +} \ No newline at end of file diff --git a/src/request/config.js b/src/request/config.js deleted file mode 100644 index 6b22a14..0000000 --- a/src/request/config.js +++ /dev/null @@ -1,16 +0,0 @@ -export default { - // method: 'get', - baseURL: 'http://172.16.1.63:8000', - // baseURL: 'http://172.16.1.168:8000', - // baseURL: 'http://127.0.0.1:8000', - baseWS: 'ws://172.16.1.63:8000', - // baseWS: 'ws://172.16.1.168:8000', - // baseWS: 'ws://127.0.0.1:8000', - headers: { - 'Content-Type': 'application/json;charset=UTF-8', - 'Authorization': 'token 4e63b8854974c1fdac9deb891fd74dc145b53f85' - }, - timeout: 60000, - withCredentials: true, - responseType: 'json', -} diff --git a/src/request/dev.js b/src/request/dev.js new file mode 100644 index 0000000..faa080b --- /dev/null +++ b/src/request/dev.js @@ -0,0 +1,11 @@ +export default { + baseURL: 'http://172.16.1.168:8000', + baseWS: 'ws://172.16.1.168:8000', + headers: { + 'Content-Type': 'application/json;charset=UTF-8', + 'Authorization': 'token 4e63b8854974c1fdac9deb891fd74dc145b53f85' + }, + timeout: 60000, + withCredentials: true, + responseType: 'json', +} diff --git a/src/request/index.js b/src/request/index.js index 2c6b183..b18e92f 100644 --- a/src/request/index.js +++ b/src/request/index.js @@ -1,40 +1,54 @@ import axios from "axios"; -import config from "@/request/config.js"; +import prd from "@/request/prd.js"; +import dev from "@/request/dev.js"; +import env_config from "@/env_config.js"; // import {ElMessage} from "element-plus"; // import {rejects} from "node:assert"; // import router from "@/router"; + +const environment = env_config() +const config = { + 'prd': {direct: {...prd.direct}, nginx: {...prd.nginx}}, 'dev': {direct: {...dev}, nginx: {...dev}} +} +console.log(environment, config[environment],config[environment].direct, config[environment].nginx) + + export function request(options) { - const instance = axios.create({...config}) + const instance = axios.create({ + baseURL: 'http://172.16.1.168:8000', + baseWS: 'ws://172.16.1.168:8000', + headers: { + 'Content-Type': 'application/json;charset=UTF-8', + 'Authorization': 'token 4e63b8854974c1fdac9deb891fd74dc145b53f85' + }, + timeout: 60000, + withCredentials: true, + responseType: 'json', + }) options = {...options, instance} // 使用创建的实例 // 请求拦截器 - instance.interceptors.request.use( - config => { - // 处理请求前的逻辑... + instance.interceptors.request.use(config => { + // 处理请求前的逻辑... - return config - }, - error => { - // 请求错误处理 + return config + }, error => { + // 请求错误处理 - return Promise.reject(error) - } - ) + return Promise.reject(error) + }) // 响应拦截器 - instance.interceptors.response.use( - response => { - // 处理响应数据 + instance.interceptors.response.use(response => { + // 处理响应数据 - return response - }, - error => { - // 处理响应错误 + return response + }, error => { + // 处理响应错误 - return Promise.reject(error) - } - ) + return Promise.reject(error) + }) return new Promise((resolve, reject) => { instance(options) @@ -49,45 +63,40 @@ export function request(options) { } export function request_ip(options) { - const instance = axios.create({ // method: 'get', - baseURL: 'http://172.16.1.222', - baseWS: 'ws://172.16.1.63:8000', + const instance = axios.create({ + baseURL: 'http://172.16.1.168:8000', + baseWS: 'ws://172.16.1.168:8000', headers: { 'Content-Type': 'application/json;charset=UTF-8', 'Authorization': 'token 4e63b8854974c1fdac9deb891fd74dc145b53f85' }, timeout: 60000, withCredentials: true, - responseType: 'json',}) + responseType: 'json', + }) options = {...options, instance} // 使用创建的实例 // 请求拦截器 - instance.interceptors.request.use( - config => { - // 处理请求前的逻辑... + instance.interceptors.request.use(config => { + // 处理请求前的逻辑... - return config - }, - error => { - // 请求错误处理 + return config + }, error => { + // 请求错误处理 - return Promise.reject(error) - } - ) + return Promise.reject(error) + }) // 响应拦截器 - instance.interceptors.response.use( - response => { - // 处理响应数据 + instance.interceptors.response.use(response => { + // 处理响应数据 - return response - }, - error => { - // 处理响应错误 + return response + }, error => { + // 处理响应错误 - return Promise.reject(error) - } - ) + return Promise.reject(error) + }) return new Promise((resolve, reject) => { instance(options) diff --git a/src/request/prd.js b/src/request/prd.js new file mode 100644 index 0000000..0768a5c --- /dev/null +++ b/src/request/prd.js @@ -0,0 +1,24 @@ +export default { + direct: { + baseURL: 'http://172.16.1.63:8000', + baseWS: 'ws://172.16.1.63:8000', + headers: { + 'Content-Type': 'application/json;charset=UTF-8', + 'Authorization': 'token 4e63b8854974c1fdac9deb891fd74dc145b53f85' + }, + timeout: 60000, + withCredentials: true, + responseType: 'json', + }, + nginx:{ + baseURL: 'http://172.16.1.222', + baseWS: 'ws://172.16.1.63:8000', + headers: { + 'Content-Type': 'application/json;charset=UTF-8', + 'Authorization': 'token 4e63b8854974c1fdac9deb891fd74dc145b53f85' + }, + timeout: 60000, + withCredentials: true, + responseType: 'json', + } +}