diff --git a/src/apis/ec_api.js b/src/apis/ec_api.js index e64eb28..00b3265 100644 --- a/src/apis/ec_api.js +++ b/src/apis/ec_api.js @@ -1,4 +1,4 @@ -import {request, request_ip} from "@/request/index.js"; +import request from "@/request/index.js"; export const get_ec_api_env = () => { return request({ @@ -77,7 +77,7 @@ export const get_ec_api_request_url = (req_data) => { } export const ec_api_send_request = (req_data) => { - return request_ip({ + return request({ url: 'ec/send_request', method: 'post', data: { @@ -103,7 +103,7 @@ export const ec_api_get_suggest = (api_type, api, env, cid, pid, options) => { if (options) { req_params['options'] = options } - return request_ip({ + return request({ url: 'ec/get_suggest_params', method: 'get', params: req_params @@ -121,7 +121,7 @@ export const ec_api_get_suggest_timestamp = (api_type, api, env, cid, pid, optio if (options !== null) { req_params['options'] = options } - return request_ip({ + return request({ url: 'ec/get_suggest_params_timestamp', method: 'get', params: req_params @@ -129,7 +129,7 @@ export const ec_api_get_suggest_timestamp = (api_type, api, env, cid, pid, optio } export const ec_api_set_user_data = (req_data) => { - return request_ip({ + return request({ url: 'ec/set_user_data', method: 'post', data: { @@ -145,7 +145,7 @@ export const ec_api_set_user_data = (req_data) => { } export const ec_api_clear_user_data = (req_data) => { - return request_ip({ + return request({ url: 'ec/clear_user_data', method: 'post', data: { diff --git a/src/apis/mock.js b/src/apis/mock.js index d010465..a5917bb 100644 --- a/src/apis/mock.js +++ b/src/apis/mock.js @@ -1,4 +1,4 @@ -import {request} from "@/request/index.js"; +import request from "@/request/index.js"; export const get_overtime_show_info = (params) => { const req_params = { diff --git a/src/apis/update.js b/src/apis/update.js index e790a5d..330b7a0 100644 --- a/src/apis/update.js +++ b/src/apis/update.js @@ -1,4 +1,4 @@ -import {request} from "@/request/index.js"; +import request from "@/request/index.js"; export const cinema_list = () => { // console.log('cinema_list') diff --git a/src/request/config.js b/src/request/config.js index 0ffc86b..6b22a14 100644 --- a/src/request/config.js +++ b/src/request/config.js @@ -1,10 +1,10 @@ export default { // method: 'get', - // baseURL: 'http://172.16.1.63:8000', - baseURL: 'http://172.16.1.168:8000', + 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://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', diff --git a/src/request/index.js b/src/request/index.js index f6ac028..353a05d 100644 --- a/src/request/index.js +++ b/src/request/index.js @@ -4,7 +4,7 @@ import config from "@/request/config.js"; // import {rejects} from "node:assert"; // import router from "@/router"; -export function request(options) { +function request(options) { const instance = axios.create({...config}) options = {...options, instance} // 使用创建的实例 @@ -48,59 +48,6 @@ export function request(options) { }) } -export function request_ip(options) { - const instance = axios.create({ - baseURL: 'http://172.16.1.222', - 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 => { - // 处理请求前的逻辑... - - return config - }, - error => { - // 请求错误处理 - - return Promise.reject(error) - } - ) - - // 响应拦截器 - instance.interceptors.response.use( - response => { - // 处理响应数据 - - return response - }, - error => { - // 处理响应错误 - - return Promise.reject(error) - } - ) - - return new Promise((resolve, reject) => { - instance(options) - .then(res => { - resolve(res.data) - // console.log(res.data) - }) - .catch(err => { - reject(err) - }) - }) -} - // // // 调试信息 // const config = { @@ -128,5 +75,4 @@ export function request_ip(options) { // console.log(res) // }) -// export default {request,request_ip} - +export default request