From 651d00a5ed8221f18093ecc45089b928c36fb601 Mon Sep 17 00:00:00 2001 From: xzx Date: Wed, 1 Jul 2020 11:04:11 +0800 Subject: [PATCH] [VersionBeta] V.1.0.0.0 [Adds] 1.prod.env.js --- config/prod.env.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/config/prod.env.js b/config/prod.env.js index dd94729f..5e7f74db 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,18 +4,10 @@ module.exports = { // API_HOST:'"https://api.tszcloud.com/api/"', // API_WEB:'"https://tszcloud.com/"', // OFFICE_WEB:'"https://office.tszcloud.com"' - -<<<<<<< HEAD - API_HOST:'"https://bapi.tszcloud.com/api/"', - API_WEB:'"https://beta.tszcloud.com/"', - OFFICE_WEB:'"https://office.tszcloud.com"' - // API_HOST:'"http://192.168.5.32:9003/api/"', - // API_WEB:'"http://192.168.5.32:9099/"', -======= API_HOST: '"https://bapi.tszcloud.com/api/"', API_WEB: '"https://beta.tszcloud.com/"', OFFICE_WEB: '"https://office.tszcloud.com"' //API_HOST:'"http://192.168.5.25:9003/api/"', // API_WEB:'"http://192.168.5.25:9099/"', ->>>>>>> 215f30b28d4a387a4f9e47fa6f4c39f34e00f6ed + }