From f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 28 May 2018 11:49:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/core/net/default.interceptor.ts |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/core/net/default.interceptor.ts b/src/app/core/net/default.interceptor.ts
index 33a9917..cd954e0 100644
--- a/src/app/core/net/default.interceptor.ts
+++ b/src/app/core/net/default.interceptor.ts
@@ -69,8 +69,9 @@
         }        
         // ���������������������������
         let url = req.url;
-        if (!url.startsWith('https://') && !url.startsWith('http://')) {
-            url = environment.SERVER_URL + url;
+        if (!url.startsWith('https://') && !url.startsWith('http://')&& !url.startsWith('assets')) {
+            // url = environment.SERVER_URL + url;
+            url = environment.SERVER_BASH_URL+url;
         }
 
         const newReq = req.clone({

--
Gitblit v1.8.0