From 05b03aa8cc49dc9415c011522433dd261704cc5b Mon Sep 17 00:00:00 2001
From: guoshipeng <3194674006@qq.com>
Date: Sat, 17 Dec 2022 13:22:45 +0800
Subject: [PATCH] src/utils/request冲突解决提交

---
 src/utils/request.js |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 8ba07c0..1ec3d2b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,13 +2,16 @@
 import { MessageBox, Message } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
-
 const baseUrl = 'http://47.99.64.149:8081/'
 // const baseUrl = 'http://192.168.0.42:8081/' // lzj
 // const baseUrl = 'http://192.168.0.33:8081/' // yy
 // const baseUrl = 'http://192.168.0.25:8081' // jj
 // const baseUrl = 'http://192.168.0.33:8085/'// swb
+// const baseUrl = 'http://192.168.0.33:8081/' // new swb
 // const baseUrl = 'http://121.43.179.139:8080'
+// const baseUrl = 'http://192.168.0.33:8085/'
+// const baseUrl = 'http://192.168.0.33:8081/'
+
 // create an axios instance
 const service = axios.create({
   // baseURL: 'http://47.99.64.149:8080/screen_api_v2/', // url = base url + request url
@@ -19,6 +22,8 @@
   timeout: 50000 // request timeout
 })
 const reqServe = axios.create({ baseurl: 'http://121.43.179.139:8080', timeout: '5000' })
+// const reqServe1 = axios.create({ baseurl: 'http://192.168.55.1:8081', timeout: '5000' })
+
 // instance1������������������������ baseurl,timeout,method,url instance1.get('/userinfo').then(res=>{ console.log(res) }) //instance2������������������������ baseurl,timeout,method,url���params,���������timeout��������������� instance1.get('/orderlist',{ timeout:'5000' params:{} }).then(res=>{ console.log(res) })
 // ���������������
 service.interceptors.request.use(

--
Gitblit v1.8.0