From fb6d7af7c924e6c1e23251fce4c79aaadb5664a2 Mon Sep 17 00:00:00 2001 From: doublekou <951513186@qq.com> Date: Fri, 24 Nov 2023 11:59:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E6=B5=8B?= =?UTF-8?q?=E5=BC=8F=E5=A4=96=E5=91=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.env.development b/.env.development index 02f887d..450ad4f 100644 --- a/.env.development +++ b/.env.development @@ -18,8 +18,4 @@ VUE_APP_BASE_IMG = 'http://39.100.77.21:8013' VUE_APP_WS_API = 'wss://baiyee.vip' # 是否启用 babel-plugin-dynamic-import-node插件 -<<<<<<< HEAD VUE_CLI_BABEL_TRANSPILE_MODULES = true -======= -VUE_CLI_BABEL_TRANSPILE_MODULES = true ->>>>>>> 4025a156f728ac573dc4bae6b4f1f08f2072752c From 2d2a48c2daeb2de13df37d35943a6f2b4bc3c6a6 Mon Sep 17 00:00:00 2001 From: doublekou <951513186@qq.com> Date: Fri, 24 Nov 2023 16:28:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- .env.production | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index 450ad4f..f592b22 100644 --- a/.env.development +++ b/.env.development @@ -13,8 +13,8 @@ ENV = 'development' #VUE_APP_BASE_API = 'http://172.18.0.228:8899ts' # jt # VUE_APP_BASE_API = 'http://172.18.1.8:8899' -VUE_APP_BASE_API = 'http://39.100.77.21:8013' -VUE_APP_BASE_IMG = 'http://39.100.77.21:8013' +VUE_APP_BASE_API = 'http://39.100.77.21:8899' +VUE_APP_BASE_IMG = 'http://39.100.77.21:8899' VUE_APP_WS_API = 'wss://baiyee.vip' # 是否启用 babel-plugin-dynamic-import-node插件 diff --git a/.env.production b/.env.production index f242ec6..526b230 100644 --- a/.env.production +++ b/.env.production @@ -9,7 +9,7 @@ ENV = 'production' # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http -VUE_APP_BASE_API = 'https://baiyee.vip' -VUE_APP_BASE_IMG = 'https://baiyee.vip' +VUE_APP_BASE_API = 'http://39.100.77.21:8899' +VUE_APP_BASE_IMG = 'http://39.100.77.21:8899' # 如果接口是 http 形式， wss 需要改为 ws VUE_APP_WS_API = 'wss://baiyee.vip' \ No newline at end of file