Merge pull request '更新' (#24) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #24
This commit is contained in:
commit
0cd8970053
@ -46,18 +46,9 @@ module.exports = {
|
|||||||
// 这里写入需要代理的api和对应的目标地址
|
// 这里写入需要代理的api和对应的目标地址
|
||||||
proxy: {
|
proxy: {
|
||||||
'/api': {
|
'/api': {
|
||||||
<<<<<<< HEAD
|
|
||||||
target: 'http://localhost:8080',
|
|
||||||
// target: 'http://192.168.0.148:8080',
|
|
||||||
=======
|
|
||||||
<<<<<<< HEAD
|
|
||||||
// target: 'http://localhost:8080',
|
// target: 'http://localhost:8080',
|
||||||
target: 'http://192.168.0.148:8080',
|
|
||||||
=======
|
|
||||||
// target: 'http://192.168.0.148:8080',
|
// target: 'http://192.168.0.148:8080',
|
||||||
target: 'http://a.wms.picaiba.com/api',
|
target: 'http://a.wms.picaiba.com/api',
|
||||||
>>>>>>> 14bf2dc2f6d116f4005fe216e91bb59aa7ba338f
|
|
||||||
>>>>>>> develop
|
|
||||||
// target: 'http://192.168.0.127:8080',
|
// target: 'http://192.168.0.127:8080',
|
||||||
// target: 'http://192.168.0.165:8080',
|
// target: 'http://192.168.0.165:8080',
|
||||||
// target: 'http://192.168.43.105:8080',
|
// target: 'http://192.168.43.105:8080',
|
||||||
|
Loading…
Reference in New Issue
Block a user