From 3d49dbbd9a5e15d14fc0a4388b17c19c0ac2e5f7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 13 Jul 2018 11:06:06 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/delon.module.ts | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/app/delon.module.ts b/src/app/delon.module.ts
index 0305521..a0a5c48 100644
--- a/src/app/delon.module.ts
+++ b/src/app/delon.module.ts
@@ -175,11 +175,13 @@
import { AlainACLModule } from '@delon/acl';
import { DelonCacheModule } from '@delon/cache';
// mock
-// import { DelonMockModule } from '@delon/mock';
-// import * as MOCKDATA from '../../_mock';
-// import { environment } from '@env/environment';
+import { DelonMockModule } from '@delon/mock';
+import * as MOCKDATA from '../../_mock';
+import { environment } from '@env/environment';
// const MOCKMODULE = !environment.production || environment.chore === true ?
// [ DelonMockModule.forRoot({ data: MOCKDATA }) ] : [];
+// ������ ������ ������ ������mock
+const MOCKMODULE = [ DelonMockModule.forRoot({ data: MOCKDATA }) ];
// region: global config functions
@@ -204,7 +206,7 @@
AdReuseTabModule.forRoot(), AdFullContentModule.forRoot(), AdXlsxModule.forRoot(), AdZipModule.forRoot(),
// auth
AlainAuthModule.forRoot({
- // ignores: [ `\\/login`, `assets\\/` ],
+ ignores: [ `\\/login`, `assets\\/` ],
token_send_key : 'X-Authorization',
token_send_template : 'Bearer ${token}',
token_send_place : 'header',
@@ -216,7 +218,7 @@
// cache
DelonCacheModule.forRoot(),
// mock
- // ...MOCKMODULE
+ ...MOCKMODULE
]
})
export class DelonModule {
--
Gitblit v1.8.0