From f325e58c5a08910e081698e702a6baf3ce00db54 Mon Sep 17 00:00:00 2001 From: Your Name <123456> Date: 星期四, 08 九月 2022 16:58:14 +0800 Subject: [PATCH] 冲突 --- .env.development | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.env.development b/.env.development index 743a43c..ee719e1 100644 --- a/.env.development +++ b/.env.development @@ -7,7 +7,7 @@ #VITE_API_URL = 'http://192.168.0.50:8008' #张凤接口地址 -VITE_API_URL = 'http://192.168.0.29:8008' +#VITE_API_URL = 'http://192.168.0.29:8008' #黄振接口地址 #VITE_API_URL = 'http://192.168.0.179:8008' @@ -16,26 +16,21 @@ #VITE_API_URL = 'http://192.168.0.69:8008' #戚会山接口地址 -#VITE_API_URL = 'http://192.168.0.52:8011/safeplatform' -#本地测试接口地址 - -#VITE_API_URL_OUT = 'http://192.168.0.52:8011/safeplatform-out' -#本地外包测试接口地址 - #VITE_API_URL = 'http://121.239.169.27:16006/safeplatform' #线上正式环境接口地址 #VITE_API_URL_OUT = 'http://121.239.169.27:16006/safeplatform-out' #线上正式环境外包接口地址 -#VITE_API_URL = 'http://192.168.0.52:8011/safeplatform' +VITE_API_URL = 'http://192.168.0.52:8011/safeplatform' #本地预发接口地址 -#VITE_API_URL_OUT = 'http://192.168.0.52:8011/safeplatform-out' +VITE_API_URL_OUT = 'http://192.168.0.52:8011/safeplatform-out' #本地外包预发接口地址 -#VITE_API_URL_SOCKET = 'http://192.168.0.29:8018' -#黄振websocket接口地址 + +#VITE_API_URL_OUT = 'http://192.168.0.52:7021/safeplatform-out' + #VITE_API_URL = 'http://192.168.0.52:7021/safeplatform' #本地测试接口地址 @@ -48,3 +43,6 @@ #VITE_API_URL_SOCKET = 'http://192.168.0.29:16107' #黄振websocket test接口地址 + +#VITE_API_URL_SOCKET = 'http://192.168.0.29:8018' +#黄振websocket接口地址 -- Gitblit v1.9.2