From 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 11:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/environments/environment.ts | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b7f639a..6163163 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,5 +4,10 @@
// The list of which env maps to which file can be found in `.angular-cli.json`.
export const environment = {
- production: false
+ chore: false,
+ SERVER_URL: `./`,
+ production: false,
+ hmr: false,
+ useHash: true,
+ SERVER_BASH_URL: `http://47.96.171.62:8080/screen_api_v2/`
};
--
Gitblit v1.8.0