From 6da582b887cf7ceadf1617417d7c15b239a2e008 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:45:08 +0800
Subject: [PATCH] 设备mac地址唯一性检验，查询数据行业添加
---
src/app/core/net/default.interceptor.ts | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/app/core/net/default.interceptor.ts b/src/app/core/net/default.interceptor.ts
index e18e15a..cd954e0 100644
--- a/src/app/core/net/default.interceptor.ts
+++ b/src/app/core/net/default.interceptor.ts
@@ -10,6 +10,7 @@
import { NzMessageService } from 'ng-zorro-antd';
import { _HttpClient } from '@delon/theme';
import { environment } from '@env/environment';
+import { LoginService } from '@business/services/http/login.service';
/**
* ������HTTP������������������������������ `app.module.ts`
@@ -62,11 +63,15 @@
intercept(req: HttpRequest<any>, next: HttpHandler):
Observable<HttpSentEvent | HttpHeaderResponse | HttpProgressEvent | HttpResponse<any> | HttpUserEvent<any>> {
-
+ if (!req.headers.get('X-Refrsh-Token')) {
+ const loginService = <LoginService>this.injector.get(LoginService);
+ loginService.refreshToken();
+ }
// ���������������������������
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