修改配置文件的组织方式

main
RogerWork 4 months ago
parent 4828a1cfce
commit a69192c80e
  1. 2
      src/components/update/CinemaUpdate.vue
  2. 3
      src/env_config.js
  3. 16
      src/request/config.js
  4. 11
      src/request/dev.js
  5. 101
      src/request/index.js
  6. 24
      src/request/prd.js

@ -3,7 +3,7 @@ import {onBeforeMount, ref, computed} from "vue";
import {useStore} from "vuex"; import {useStore} from "vuex";
import {get_git_ver, get_update_alter, get_update_option, handle_update} from "@/apis/update.js" import {get_git_ver, get_update_alter, get_update_option, handle_update} from "@/apis/update.js"
import Tips from "@/components/update/Tips.vue" 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 ProcessIcon from "@/components/update/ProcessIcon.vue";
import {ElMessageBox} from "element-plus"; import {ElMessageBox} from "element-plus";

@ -0,0 +1,3 @@
export default function env_config() {
return 'dev'
}

@ -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',
}

@ -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',
}

@ -1,40 +1,54 @@
import axios from "axios"; 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 {ElMessage} from "element-plus";
// import {rejects} from "node:assert"; // import {rejects} from "node:assert";
// import router from "@/router"; // 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) { 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} // 使用创建的实例 options = {...options, instance} // 使用创建的实例
// 请求拦截器 // 请求拦截器
instance.interceptors.request.use( instance.interceptors.request.use(config => {
config => { // 处理请求前的逻辑...
// 处理请求前的逻辑...
return config return config
}, }, error => {
error => { // 请求错误处理
// 请求错误处理
return Promise.reject(error) return Promise.reject(error)
} })
)
// 响应拦截器 // 响应拦截器
instance.interceptors.response.use( instance.interceptors.response.use(response => {
response => { // 处理响应数据
// 处理响应数据
return response return response
}, }, error => {
error => { // 处理响应错误
// 处理响应错误
return Promise.reject(error) return Promise.reject(error)
} })
)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
instance(options) instance(options)
@ -49,45 +63,40 @@ export function request(options) {
} }
export function request_ip(options) { export function request_ip(options) {
const instance = axios.create({ // method: 'get', const instance = axios.create({
baseURL: 'http://172.16.1.222', baseURL: 'http://172.16.1.168:8000',
baseWS: 'ws://172.16.1.63:8000', baseWS: 'ws://172.16.1.168:8000',
headers: { headers: {
'Content-Type': 'application/json;charset=UTF-8', 'Content-Type': 'application/json;charset=UTF-8',
'Authorization': 'token 4e63b8854974c1fdac9deb891fd74dc145b53f85' 'Authorization': 'token 4e63b8854974c1fdac9deb891fd74dc145b53f85'
}, },
timeout: 60000, timeout: 60000,
withCredentials: true, withCredentials: true,
responseType: 'json',}) responseType: 'json',
})
options = {...options, instance} // 使用创建的实例 options = {...options, instance} // 使用创建的实例
// 请求拦截器 // 请求拦截器
instance.interceptors.request.use( instance.interceptors.request.use(config => {
config => { // 处理请求前的逻辑...
// 处理请求前的逻辑...
return config return config
}, }, error => {
error => { // 请求错误处理
// 请求错误处理
return Promise.reject(error) return Promise.reject(error)
} })
)
// 响应拦截器 // 响应拦截器
instance.interceptors.response.use( instance.interceptors.response.use(response => {
response => { // 处理响应数据
// 处理响应数据
return response return response
}, }, error => {
error => { // 处理响应错误
// 处理响应错误
return Promise.reject(error) return Promise.reject(error)
} })
)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
instance(options) instance(options)

@ -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',
}
}
Loading…
Cancel
Save