Merge pull request #53 from xiaohai2271/dependabot/npm_and_yarn/ng-zorro-antd-10.1.2

package-lock.json

@@ -199,17 +199,18 @@
       }
     },
     "@angular/cdk": {
-      "version": "9.2.4",
-      "resolved": "https://registry.npm.taobao.org/@angular/cdk/download/@angular/cdk-9.2.4.tgz",
-      "integrity": "sha1-hBOVi9J15MNL47lvVkRGcd0wupM=",
+      "version": "10.2.7",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-10.2.7.tgz",
+      "integrity": "sha512-ZQjDfTRTn7JuAKsf3jiIdU2XBaxxGBi/ZWYv5Pb3HCl6B4PISsIE5VWRhkoUogoAB0MiFHpjnWeIqknJEm11YQ==",
       "requires": {
-        "parse5": "^5.0.0"
+        "parse5": "^5.0.0",
+        "tslib": "^2.0.0"
       },
       "dependencies": {
         "parse5": {
           "version": "5.1.1",
-          "resolved": "https://registry.npm.taobao.org/parse5/download/parse5-5.1.1.tgz",
-          "integrity": "sha1-9o5OW6GFKsLK3AD0VV//bCq7YXg=",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+          "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
           "optional": true
         }
       }
@@ -474,19 +475,20 @@
       }
     },
     "@ant-design/colors": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npm.taobao.org/@ant-design/colors/download/@ant-design/colors-3.2.2.tgz?cache=0&sync_timestamp=1577271695621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Fcolors%2Fdownload%2F%40ant-design%2Fcolors-3.2.2.tgz",
-      "integrity": "sha1-WtQ9YZ6RHzSI66wwPWBuZqhCOQM=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-5.0.0.tgz",
+      "integrity": "sha512-Pe1rYorgVC1v4f+InDXvIlQH715pO1g7BsOhy/ehX/U6ebPKqojmkYJKU3lF+84Zmvyar7ngZ28hesAa1nWjLg==",
       "requires": {
-        "tinycolor2": "^1.4.1"
+        "@ctrl/tinycolor": "^3.1.6"
       }
     },
     "@ant-design/icons-angular": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npm.taobao.org/@ant-design/icons-angular/download/@ant-design/icons-angular-9.0.1.tgz?cache=0&sync_timestamp=1586316149004&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Ficons-angular%2Fdownload%2F%40ant-design%2Ficons-angular-9.0.1.tgz",
-      "integrity": "sha1-Wsi+xbw00jEgggyT+FEbWaoRe8U=",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/@ant-design/icons-angular/-/icons-angular-10.2.0.tgz",
+      "integrity": "sha512-c5g31hD9otf0DAmHMlvijyOcq1sXpdqKbMFZHxXAUG2sTi+cgixqI8LNePCc9MxBy0N48gAmp0CfhGiByxZJnQ==",
       "requires": {
-        "@ant-design/colors": "^3.1.0"
+        "@ant-design/colors": "^5.0.0",
+        "tslib": "^2.0.0"
       }
     },
     "@babel/code-frame": {
@@ -1560,6 +1562,11 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@ctrl/tinycolor": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.1.7.tgz",
+      "integrity": "sha512-/0C6fjXbCwu22k8mMsKRSAo9zgu61d2p75Or9IuIC0Vu5CWN88t2QHK93LhNnxnqHWf5SFwFU28w9cKfTmnfvg=="
+    },
     "@istanbuljs/schema": {
       "version": "0.1.2",
       "resolved": "https://registry.npm.taobao.org/@istanbuljs/schema/download/@istanbuljs/schema-0.1.2.tgz",
@@ -3996,9 +4003,9 @@
       }
     },
     "date-fns": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npm.taobao.org/date-fns/download/date-fns-2.14.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdate-fns%2Fdownload%2Fdate-fns-2.14.0.tgz",
-      "integrity": "sha1-NZqHomW7NO8uOPk+z2OsRT+bx7o="
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.16.1.tgz",
+      "integrity": "sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ=="
     },
     "date-format": {
       "version": "3.0.0",
@@ -4208,8 +4215,8 @@
     },
     "diff-match-patch": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz",
-      "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="
+      "resolved": "https://registry.npm.taobao.org/diff-match-patch/download/diff-match-patch-1.0.5.tgz",
+      "integrity": "sha1-q7WE1fEM0Rlt/FWqA3AVkq4/ezc="
     },
     "diffie-hellman": {
       "version": "5.0.3",
@@ -7881,22 +7888,15 @@
       "dev": true
     },
     "ng-zorro-antd": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npm.taobao.org/ng-zorro-antd/download/ng-zorro-antd-9.3.0.tgz",
-      "integrity": "sha1-+A2+JxXleMR1codzRJRC8AmfFSw=",
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/ng-zorro-antd/-/ng-zorro-antd-10.1.2.tgz",
+      "integrity": "sha512-T6ph9ITeTS0ohX+VsyZaVrls53fgyTMJ0RFddJCK2WyQgg+BTznlSw24fJWgdTcocoIuPSBuVO27ecyZwN6Hhw==",
       "requires": {
-        "@angular/cdk": "^9.0.0",
-        "@ant-design/icons-angular": "^9.0.0",
+        "@angular/cdk": "^10.2.4",
+        "@ant-design/icons-angular": "^10.0.0",
         "date-fns": "^2.10.0",
         "resize-observer-polyfill": "^1.5.1",
-        "tslib": "^1.10.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npm.taobao.org/tslib/download/tslib-1.13.0.tgz",
-          "integrity": "sha1-yIHhPMcBWJTtkUhi0nZDb6mkcEM="
-        }
+        "tslib": "^2.0.0"
       }
     },
     "nice-try": {
@@ -8154,6 +8154,12 @@
       "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
       "dev": true
     },
+    "nz-tslint-rules": {
+      "version": "0.901.2",
+      "resolved": "https://registry.npm.taobao.org/nz-tslint-rules/download/nz-tslint-rules-0.901.2.tgz",
+      "integrity": "sha1-70ojrq4JHv+/PFAgLLypeUvzcx0=",
+      "dev": true
+    },
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz",
@@ -10423,8 +10429,8 @@
     },
     "resize-observer-polyfill": {
       "version": "1.5.1",
-      "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
+      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
     },
     "resolve": {
       "version": "1.17.0",
@@ -12194,11 +12200,6 @@
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
       "dev": true
     },
-    "tinycolor2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.1.tgz",
-      "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g="
-    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz",
@@ -12693,9 +12694,9 @@
       "dev": true
     },
     "vditor": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/vditor/-/vditor-3.6.0.tgz",
-      "integrity": "sha512-RzcHGntGEzpNcnRczhrWVYq9lZLEfiOGu3vX0wQQqFZUMHC3bjZIWSJJtHCUgrKdaHXheEhUH2vWLoJA3Ino6A==",
+      "version": "3.6.3",
+      "resolved": "https://registry.npm.taobao.org/vditor/download/vditor-3.6.3.tgz",
+      "integrity": "sha1-fQBvJzIIhpsmgmhFO2iK1KDeiZU=",
       "requires": {
         "diff-match-patch": "^1.0.5"
       }

package.json

@@ -22,10 +22,10 @@
     "@angular/router": "^11.0.2",
     "@angular/service-worker": "^11.0.2",
     "jquery": "^3.5.1",
-    "ng-zorro-antd": "^9.3.0",
+    "ng-zorro-antd": "^10.1.2",
     "rxjs": "^6.6.3",
     "tslib": "^2.0.3",
-    "vditor": "^3.6.0",
+    "vditor": "^3.6.3",
     "zone.js": "^0.11.2"
   },
   "devDependencies": {
@@ -44,6 +44,7 @@
     "karma-coverage-istanbul-reporter": "^3.0.3",
     "karma-jasmine": "^4.0.1",
     "karma-jasmine-html-reporter": "^1.5.4",
+    "nz-tslint-rules": "^0.901.2",
     "protractor": "^7.0.0",
     "ts-node": "^9.0.0",
     "tslint": "^6.1.3",

src/app/app.module.ts

@@ -1,7 +1,7 @@
 import {BrowserModule} from '@angular/platform-browser';
-import {forwardRef, NgModule} from '@angular/core';
+import {NgModule} from '@angular/core';
 import {AppComponent} from './app.component';
-import {NgZorroAntdModule, NZ_I18N, zh_CN} from 'ng-zorro-antd';
+import {NZ_I18N, zh_CN} from 'ng-zorro-antd/i18n';
 import {FormsModule} from '@angular/forms';
 import {HttpClientModule} from '@angular/common/http';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
@@ -20,6 +20,16 @@ import {ComponentStateService} from './services/component-state.service';
 import {GlobalUserService} from './services/global-user.service';
 import {LocalStorageService} from './services/local-storage.service';
 import {ApiService} from './api/api.service';
+import {NzMessageService} from 'ng-zorro-antd/message';
+import {NzBackTopModule} from 'ng-zorro-antd/back-top';
+import {NzModalModule} from 'ng-zorro-antd/modal';
+import {NzNotificationService} from 'ng-zorro-antd/notification';
+import {NzDropDownModule} from 'ng-zorro-antd/dropdown';
+import {NzIconModule} from 'ng-zorro-antd/icon';
+import {NzAvatarModule} from 'ng-zorro-antd/avatar';
+import {NzButtonModule} from 'ng-zorro-antd/button';
+import {NzGridModule} from 'ng-zorro-antd/grid';
+import {NzDividerModule} from 'ng-zorro-antd/divider';
 
 
 registerLocaleData(zh);
@@ -33,13 +43,20 @@ registerLocaleData(zh);
     imports: [
         BrowserModule,
         AppRoutingModule,
-        NgZorroAntdModule,
         FormsModule,
         HttpClientModule,
         BrowserAnimationsModule,
         LoginRegistrationModule,
         AdminModule,
-        ServiceWorkerModule.register('ngsw-worker.js', {enabled: environment.production})
+        ServiceWorkerModule.register('ngsw-worker.js', {enabled: environment.production}),
+        NzBackTopModule,
+        NzModalModule,
+        NzDropDownModule,
+        NzIconModule,
+        NzAvatarModule,
+        NzButtonModule,
+        NzGridModule,
+        NzDividerModule
     ],
     providers: [
         ComponentStateService,
@@ -47,6 +64,8 @@ registerLocaleData(zh);
         LocalStorageService,
         HttpService,
         ApiService,
+        NzMessageService,
+        NzNotificationService,
         ErrorService,
         {provide: NZ_I18N, useValue: zh_CN},
     ],

src/app/services/error.service.ts

@@ -3,7 +3,7 @@ import {RequestObj, Response} from '../class/HttpReqAndResp';
 import {environment} from '../../environments/environment';
 import {Router} from '@angular/router';
 import {ComponentStateService} from './component-state.service';
-import {NzNotificationService} from 'ng-zorro-antd';
+import { NzNotificationService } from 'ng-zorro-antd/notification';
 import {HttpService} from '../api/http/http.service';
 import {LocalStorageService} from './local-storage.service';
 

src/app/view/admin/admin-article/admin-article.component.ts

@@ -1,5 +1,5 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
-import {NzMessageService} from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 import {ApiService} from '../../../api/api.service';
 import {RequestObj} from '../../../class/HttpReqAndResp';
 import {Article} from '../../../class/Article';

src/app/view/admin/admin-article/admin-article.module.ts

@@ -4,7 +4,8 @@ import {RouterModule} from '@angular/router';
 import {AdminArticleComponent} from './admin-article.component';
 import {CommonTableModule} from '../components/common-table/common-table.module';
 import {FormsModule} from '@angular/forms';
-import {NzCheckboxModule, NzTagModule} from 'ng-zorro-antd';
+import { NzCheckboxModule } from 'ng-zorro-antd/checkbox';
+import { NzTagModule } from 'ng-zorro-antd/tag';
 
 @NgModule({
     declarations: [

src/app/view/admin/admin-comment/admin-comment.component.ts

@@ -1,5 +1,5 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
-import {NzMessageService} from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 import {ApiService} from '../../../api/api.service';
 import {RequestObj} from '../../../class/HttpReqAndResp';
 import {Comment, CommentReq} from '../../../class/Comment';

src/app/view/admin/admin-comment/admin-comment.module.ts

@@ -3,7 +3,10 @@ import {CommonModule} from '@angular/common';
 import {RouterModule} from '@angular/router';
 import {AdminCommentComponent} from './admin-comment.component';
 import {CommonTableModule} from '../components/common-table/common-table.module';
-import {NzAvatarModule, NzCommentModule, NzModalModule, NzTagModule} from 'ng-zorro-antd';
+import { NzAvatarModule } from 'ng-zorro-antd/avatar';
+import { NzCommentModule } from 'ng-zorro-antd/comment';
+import { NzModalModule } from 'ng-zorro-antd/modal';
+import { NzTagModule } from 'ng-zorro-antd/tag';
 import {EditableTagModule} from '../components/editable-tag/editable-tag.module';
 
 

src/app/view/admin/admin-dashboard/admin-dashboard.module.ts

@@ -2,15 +2,13 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {AdminDashboardComponent} from './admin-dashboard.component';
 import {RouterModule} from '@angular/router';
-import {
-    NzButtonModule,
-    NzCardModule,
-    NzDividerModule,
-    NzGridModule,
-    NzIconModule,
-    NzSpinModule,
-    NzStatisticModule
-} from 'ng-zorro-antd';
+import { NzButtonModule } from 'ng-zorro-antd/button';
+import { NzCardModule } from 'ng-zorro-antd/card';
+import { NzDividerModule } from 'ng-zorro-antd/divider';
+import { NzGridModule } from 'ng-zorro-antd/grid';
+import { NzIconModule } from 'ng-zorro-antd/icon';
+import { NzSpinModule } from 'ng-zorro-antd/spin';
+import { NzStatisticModule } from 'ng-zorro-antd/statistic';
 
 
 @NgModule({

src/app/view/admin/admin-link/admin-link.component.ts

@@ -2,7 +2,7 @@ import {Component, OnInit, ViewChild} from '@angular/core';
 import {RequestObj, Response} from '../../../class/HttpReqAndResp';
 import {Link} from '../../../class/Link';
 import {ApiService} from '../../../api/api.service';
-import {NzMessageService} from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 import {FormControl, FormGroup, Validators} from '@angular/forms';
 import {Observable} from 'rxjs';
 import {Title} from '@angular/platform-browser';

src/app/view/admin/admin-link/admin-link.module.ts

@@ -3,15 +3,13 @@ import {CommonModule} from '@angular/common';
 import {RouterModule} from '@angular/router';
 import {AdminLinkComponent} from './admin-link.component';
 import {CommonTableModule} from '../components/common-table/common-table.module';
-import {
-    NzButtonModule,
-    NzCheckboxModule,
-    NzFormModule,
-    NzInputModule,
-    NzModalModule,
-    NzSelectModule,
-    NzTagModule
-} from 'ng-zorro-antd';
+import { NzButtonModule } from 'ng-zorro-antd/button';
+import { NzCheckboxModule } from 'ng-zorro-antd/checkbox';
+import { NzFormModule } from 'ng-zorro-antd/form';
+import { NzInputModule } from 'ng-zorro-antd/input';
+import { NzModalModule } from 'ng-zorro-antd/modal';
+import { NzSelectModule } from 'ng-zorro-antd/select';
+import { NzTagModule } from 'ng-zorro-antd/tag';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 
 

src/app/view/admin/admin-tag/admin-tag.component.ts

@@ -1,5 +1,5 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
-import {NzMessageService} from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 import {Category, Tag} from '../../../class/Tag';
 import {ApiService} from '../../../api/api.service';
 import {PageList, RequestObj} from '../../../class/HttpReqAndResp';

src/app/view/admin/admin-tag/admin-tag.module.ts

@@ -5,7 +5,10 @@ import {AdminTagComponent} from './admin-tag.component';
 import {FormsModule} from '@angular/forms';
 import {CommonTableModule} from '../components/common-table/common-table.module';
 import {EditableTagModule} from '../components/editable-tag/editable-tag.module';
-import {NzButtonModule, NzCardModule, NzIconModule, NzTabsModule} from 'ng-zorro-antd';
+import { NzButtonModule } from 'ng-zorro-antd/button';
+import { NzCardModule } from 'ng-zorro-antd/card';
+import { NzIconModule } from 'ng-zorro-antd/icon';
+import { NzTabsModule } from 'ng-zorro-antd/tabs';
 
 
 @NgModule({

src/app/view/admin/admin-update/admin-update.component.ts

@@ -1,5 +1,5 @@
 import {Component, OnInit} from '@angular/core';
-import {NzMessageService} from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 import {Title} from '@angular/platform-browser';
 import {Observable} from 'rxjs';
 import {ApiService} from '../../../api/api.service';

src/app/view/admin/admin-update/admin-update.module.ts

@@ -5,7 +5,9 @@ import {AdminUpdateComponent} from './admin-update.component';
 
 import {FormsModule} from '@angular/forms';
 import {CommonTableModule} from '../components/common-table/common-table.module';
-import {NzButtonModule, NzInputModule, NzModalModule} from 'ng-zorro-antd';
+import { NzButtonModule } from 'ng-zorro-antd/button';
+import { NzInputModule } from 'ng-zorro-antd/input';
+import { NzModalModule } from 'ng-zorro-antd/modal';
 
 
 @NgModule({

src/app/view/admin/admin-user/admin-user.component.ts

@@ -1,5 +1,5 @@
 import {Component, OnInit} from '@angular/core';
-import {NzMessageService} from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 import {Title} from '@angular/platform-browser';
 import {FormControl, FormGroup} from '@angular/forms';
 import {RequestObj} from '../../../class/HttpReqAndResp';

src/app/view/admin/admin-user/admin-user.module.ts

@@ -4,15 +4,15 @@ import {RouterModule} from '@angular/router';
 import {AdminUserComponent} from './admin-user.component';
 import {ReactiveFormsModule} from '@angular/forms';
 import {CommonTableModule} from '../components/common-table/common-table.module';
-import {
-    NzButtonModule,
-    NzFormModule,
-    NzGridModule,
-    NzIconModule,
-    NzInputModule, NzModalModule,
-    NzRadioModule,
-    NzSelectModule, NzTagModule
-} from 'ng-zorro-antd';
+import { NzButtonModule } from 'ng-zorro-antd/button';
+import { NzFormModule } from 'ng-zorro-antd/form';
+import { NzGridModule } from 'ng-zorro-antd/grid';
+import { NzIconModule } from 'ng-zorro-antd/icon';
+import { NzInputModule } from 'ng-zorro-antd/input';
+import { NzModalModule } from 'ng-zorro-antd/modal';
+import { NzRadioModule } from 'ng-zorro-antd/radio';
+import { NzSelectModule } from 'ng-zorro-antd/select';
+import { NzTagModule } from 'ng-zorro-antd/tag';
 
 
 @NgModule({

src/app/view/admin/admin.component.ts

@@ -1,6 +1,7 @@
 import {Component, OnInit} from '@angular/core';
 import {AbstractControl, FormControl, FormGroup, Validators} from '@angular/forms';
-import {NzMessageService, UploadFile} from 'ng-zorro-antd';
+import {NzMessageService} from 'ng-zorro-antd/message';
+import {NzUploadFile} from 'ng-zorro-antd/upload';
 import {Router} from '@angular/router';
 import {GlobalUserService} from '../../services/global-user.service';
 import {User} from '../../class/User';
@@ -71,7 +72,7 @@ export class AdminComponent implements OnInit {
             return control.value !== newPwd ? {pwdNotSame: true} : null;
         };
     }
-    uploadHeader = (file: UploadFile): object | Observable<{}> => {
+    uploadHeader = (file: NzUploadFile): object | Observable<{}> => {
         return {Authorization: this.localStorageService.getToken()}
     };
 

src/app/view/admin/admin.module.ts

@@ -2,12 +2,25 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {AdminRoutingModule} from './admin-routing.module';
 import {AdminComponent} from './admin.component';
-import {NgZorroAntdModule} from 'ng-zorro-antd';
 import {NzSpaceModule} from 'ng-zorro-antd/space';
 import {AdminHeaderComponent} from '../../components/admin-header/admin-header.component';
 import {ReactiveFormsModule} from '@angular/forms';
 import {AuthGuard} from './auth.guard';
-
+import {NzAvatarModule} from 'ng-zorro-antd/avatar';
+import {NzButtonModule} from 'ng-zorro-antd/button';
+import {NzLayoutModule} from 'ng-zorro-antd/layout';
+import {NzMenuModule} from 'ng-zorro-antd/menu';
+import {NzIconModule} from 'ng-zorro-antd/icon';
+import {NzCardModule} from 'ng-zorro-antd/card';
+import {NzDividerModule} from 'ng-zorro-antd/divider';
+import {NzUploadModule} from 'ng-zorro-antd/upload';
+import {NzToolTipModule} from 'ng-zorro-antd/tooltip';
+import {NzTypographyModule} from 'ng-zorro-antd/typography';
+import {NzModalModule} from 'ng-zorro-antd/modal';
+import {NzFormModule} from 'ng-zorro-antd/form';
+import {NzInputModule} from 'ng-zorro-antd/input';
+import {NzDescriptionsModule} from 'ng-zorro-antd/descriptions';
+import {NzDrawerModule} from 'ng-zorro-antd/drawer';
 
 @NgModule({
     declarations: [
@@ -17,9 +30,23 @@ import {AuthGuard} from './auth.guard';
     imports: [
         CommonModule,
         AdminRoutingModule,
-        NgZorroAntdModule,
         NzSpaceModule,
         ReactiveFormsModule,
+        NzAvatarModule,
+        NzButtonModule,
+        NzLayoutModule,
+        NzMenuModule,
+        NzIconModule,
+        NzCardModule,
+        NzDividerModule,
+        NzUploadModule,
+        NzToolTipModule,
+        NzTypographyModule,
+        NzModalModule,
+        NzFormModule,
+        NzInputModule,
+        NzDescriptionsModule,
+        NzDrawerModule
     ],
     providers: [AuthGuard]
 })

src/app/view/admin/components/common-table/common-table.module.ts

@@ -1,15 +1,18 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {CommonTableComponent} from './common-table.component';
-import {
-    NzButtonModule,
-    NzCardModule,
-    NzDividerModule,
-    NzIconModule, NzModalModule, NzOutletModule, NzPopconfirmModule, NzSwitchModule,
-    NzTableModule, NzTagModule,
-    NzToolTipModule,
-    NzTypographyModule
-} from 'ng-zorro-antd';
+import { NzButtonModule } from 'ng-zorro-antd/button';
+import { NzCardModule } from 'ng-zorro-antd/card';
+import { NzDividerModule } from 'ng-zorro-antd/divider';
+import { NzIconModule } from 'ng-zorro-antd/icon';
+import { NzModalModule } from 'ng-zorro-antd/modal';
+import { NzOutletModule } from 'ng-zorro-antd/core/outlet';
+import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm';
+import { NzSwitchModule } from 'ng-zorro-antd/switch';
+import { NzTableModule } from 'ng-zorro-antd/table';
+import { NzTagModule } from 'ng-zorro-antd/tag';
+import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
+import { NzTypographyModule } from 'ng-zorro-antd/typography';
 import {FormsModule} from '@angular/forms';
 import {DragDropModule} from '@angular/cdk/drag-drop'
 

src/app/view/admin/components/editable-tag/editable-tag.component.ts

@@ -9,7 +9,7 @@ import {
     SimpleChanges,
     ViewChild
 } from '@angular/core';
-import {NzModalRef, NzModalService} from 'ng-zorro-antd';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
 
 @Component({
     selector: 'editable-tag',

src/app/view/admin/components/editable-tag/editable-tag.module.ts

@@ -1,7 +1,9 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {EditableTagComponent} from './editable-tag.component';
-import {NzIconModule, NzInputModule, NzTagModule} from 'ng-zorro-antd';
+import { NzIconModule } from 'ng-zorro-antd/icon';
+import { NzInputModule } from 'ng-zorro-antd/input';
+import { NzTagModule } from 'ng-zorro-antd/tag';
 import {FormsModule} from '@angular/forms';
 
 

src/app/view/admin/test-common-table/test-common-table.module.ts

@@ -3,7 +3,8 @@ import {CommonModule} from '@angular/common';
 import {TestCommonTableComponent} from './test-common-table.component';
 import {Router, RouterModule} from '@angular/router';
 import {CommonTableModule} from '../components/common-table/common-table.module';
-import {NzCheckboxModule, NzTagModule} from 'ng-zorro-antd';
+import { NzCheckboxModule } from 'ng-zorro-antd/checkbox';
+import { NzTagModule } from 'ng-zorro-antd/tag';
 import {FormsModule} from '@angular/forms';
 import {EditableTagModule} from '../components/editable-tag/editable-tag.module';
 

src/app/view/article/article.module.ts

@@ -2,16 +2,19 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {ArticleRoutingModule} from './article-routing.module';
 import {ArticleComponent} from './article.component';
-import {
-    NzAffixModule,
-    NzAnchorModule, NzAvatarModule,
-    NzButtonModule,
-    NzCommentModule,
-    NzDividerModule, NzFormModule,
-    NzGridModule,
-    NzIconModule, NzInputModule,
-    NzLayoutModule, NzListModule, NzTabsModule
-} from 'ng-zorro-antd';
+import { NzAffixModule } from 'ng-zorro-antd/affix';
+import { NzAnchorModule } from 'ng-zorro-antd/anchor';
+import { NzAvatarModule } from 'ng-zorro-antd/avatar';
+import { NzButtonModule } from 'ng-zorro-antd/button';
+import { NzCommentModule } from 'ng-zorro-antd/comment';
+import { NzDividerModule } from 'ng-zorro-antd/divider';
+import { NzFormModule } from 'ng-zorro-antd/form';
+import { NzGridModule } from 'ng-zorro-antd/grid';
+import { NzIconModule } from 'ng-zorro-antd/icon';
+import { NzInputModule } from 'ng-zorro-antd/input';
+import { NzLayoutModule } from 'ng-zorro-antd/layout';
+import { NzListModule } from 'ng-zorro-antd/list';
+import { NzTabsModule } from 'ng-zorro-antd/tabs';
 import {FormsModule} from '@angular/forms';
 
 

src/app/view/category/category.component.ts

@@ -1,7 +1,7 @@
 import {Component, OnInit} from '@angular/core';
 import {ApiService} from '../../api/api.service';
 import {Tag} from '../../class/Tag';
-import {NzMessageService} from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 import {PageList} from '../../class/HttpReqAndResp';
 import {Article} from '../../class/Article';
 import {ActivatedRoute} from '@angular/router';

src/app/view/category/category.module.ts

@@ -2,7 +2,8 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {CategoryComponent} from './category.component';
 import {CategoryRoutingModule} from './category-routing.module';
-import {NzIconModule, NzToolTipModule} from 'ng-zorro-antd';
+import { NzIconModule } from 'ng-zorro-antd/icon';
+import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
 import {IndexModule} from '../index/index.module';
 
 

src/app/view/email-verify/email-verify.module.ts

@@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {Route, RouterModule} from '@angular/router';
 import {EmailVerifyComponent} from './email-verify.component';
-import {NzAlertModule} from 'ng-zorro-antd';
+import { NzAlertModule } from 'ng-zorro-antd/alert';
 
 const routes: Route[] = [
     {path: '**', component: EmailVerifyComponent}

src/app/view/index/index.component.ts

@@ -1,7 +1,8 @@
 import {Component, OnInit} from '@angular/core';
 import {ApiService} from '../../api/api.service';
 import {Article} from '../../class/Article';
-import {NzIconService, NzMessageService} from 'ng-zorro-antd';
+import { NzIconService } from 'ng-zorro-antd/icon';
+import { NzMessageService } from 'ng-zorro-antd/message';
 import {SvgIconUtil} from '../../utils/svgIconUtil';
 import {PageList, RequestObj} from '../../class/HttpReqAndResp';
 import {Router} from '@angular/router';

src/app/view/index/index.module.ts

@@ -3,15 +3,13 @@ import {CommonModule} from '@angular/common';
 import {IndexComponent} from './index.component';
 import {IndexRoutingModule} from './index-routing.module';
 import {ArticleDetailCardComponent} from './components/article-detail-card/article-detail-card.component';
-import {
-    NzBackTopModule,
-    NzCardModule,
-    NzDividerModule,
-    NzGridModule,
-    NzIconModule,
-    NzPaginationModule,
-    NzToolTipModule
-} from 'ng-zorro-antd';
+import { NzBackTopModule } from 'ng-zorro-antd/back-top';
+import { NzCardModule } from 'ng-zorro-antd/card';
+import { NzDividerModule } from 'ng-zorro-antd/divider';
+import { NzGridModule } from 'ng-zorro-antd/grid';
+import { NzIconModule } from 'ng-zorro-antd/icon';
+import { NzPaginationModule } from 'ng-zorro-antd/pagination';
+import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
 import { CardDetailComponent } from './components/card-detail/card-detail.component';
 import { TagTagComponent } from './components/tag-tag/tag-tag.component';
 

src/app/view/link/link.component.ts

@@ -1,5 +1,6 @@
 import {Component, OnInit} from '@angular/core';
-import {NzMessageService, NzModalService} from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalService } from 'ng-zorro-antd/modal';
 import {Title} from '@angular/platform-browser';
 import {ApiService} from '../../api/api.service';
 import {ApplyLinkReq, Link} from '../../class/Link';

src/app/view/link/link.module.ts

@@ -1,7 +1,12 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {LinkComponent} from './link.component';
-import {NzButtonModule, NzFormModule, NzIconModule, NzInputModule, NzModalModule, NzSelectModule} from 'ng-zorro-antd';
+import { NzButtonModule } from 'ng-zorro-antd/button';
+import { NzFormModule } from 'ng-zorro-antd/form';
+import { NzIconModule } from 'ng-zorro-antd/icon';
+import { NzInputModule } from 'ng-zorro-antd/input';
+import { NzModalModule } from 'ng-zorro-antd/modal';
+import { NzSelectModule } from 'ng-zorro-antd/select';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {RouterModule} from '@angular/router';
 

src/app/view/login-registration/components/login/login.component.ts

@@ -1,5 +1,5 @@
 import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
-import {NzMessageService} from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 import {LoginReq} from '../../../../class/User';
 import {ActivatedRoute, Router} from '@angular/router';
 import {LoginRegistrationService} from '../../service/login-registration.service';

src/app/view/login-registration/components/registration/registration.component.ts

@@ -1,7 +1,7 @@
 import {Component, EventEmitter, OnInit, Output} from '@angular/core';
 import {environment} from '../../../../../environments/environment';
 import {ApiService} from '../../../../api/api.service';
-import {NzMessageService} from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 import {Router} from '@angular/router';
 import {RequestObj} from '../../../../class/HttpReqAndResp';
 import {LoginReq} from '../../../../class/User';

src/app/view/login-registration/login-registration.component.ts

@@ -1,7 +1,7 @@
 import {Component, OnInit} from '@angular/core';
 import {ApiService} from '../../api/api.service';
 import {LoginRegistrationService} from './service/login-registration.service';
-import {NzMessageService} from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 
 @Component({
     selector: 'view-login-registration',

src/app/view/login-registration/login-registration.module.ts

@@ -6,7 +6,11 @@ import {RegistrationComponent} from './components/registration/registration.comp
 import {LoginRegistrationRoutingModule} from './login-registration-routing.module';
 import {LoginRegistrationComponent} from './login-registration.component';
 import {FormsModule} from '@angular/forms';
-import {NzButtonModule, NzFormModule, NzGridModule, NzInputModule, NzModalModule} from 'ng-zorro-antd';
+import { NzButtonModule } from 'ng-zorro-antd/button';
+import { NzFormModule } from 'ng-zorro-antd/form';
+import { NzGridModule } from 'ng-zorro-antd/grid';
+import { NzInputModule } from 'ng-zorro-antd/input';
+import { NzModalModule } from 'ng-zorro-antd/modal';
 
 
 @NgModule({

src/app/view/maintain/maintain.module.ts

@@ -2,7 +2,8 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {MaintainComponent} from './maintain.component';
 import {RouterModule} from '@angular/router';
-import {NzButtonModule, NzResultModule} from 'ng-zorro-antd';
+import { NzButtonModule } from 'ng-zorro-antd/button';
+import { NzResultModule } from 'ng-zorro-antd/result';
 
 
 @NgModule({

src/app/view/reset-pwd/reset-pwd.component.ts

@@ -1,5 +1,5 @@
 import {Component, OnInit} from '@angular/core';
-import {NzMessageService} from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 import {ActivatedRoute, Router} from '@angular/router';
 import {ApiService} from '../../api/api.service';
 import {Title} from '@angular/platform-browser';

src/app/view/reset-pwd/reset-pwd.module.ts

@@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {Route, RouterModule} from '@angular/router';
 import {ResetPwdComponent} from './reset-pwd.component';
-import {NzAlertModule} from 'ng-zorro-antd';
+import { NzAlertModule } from 'ng-zorro-antd/alert';
 import {FormsModule} from '@angular/forms';
 
 const routes: Route[] = [

src/app/view/tag/tag.component.ts

@@ -2,7 +2,7 @@ import {Component, OnInit} from '@angular/core';
 import {PageList} from '../../class/HttpReqAndResp';
 import {Article} from '../../class/Article';
 import {ApiService} from '../../api/api.service';
-import {NzMessageService} from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 import {Location} from '@angular/common';
 import {ActivatedRoute} from '@angular/router';
 import {Title} from '@angular/platform-browser';

src/app/view/update/update.module.ts

@@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {UpdateComponent} from './update.component';
 import {Route, RouterModule} from '@angular/router';
-import {NzTagModule} from 'ng-zorro-antd';
+import { NzTagModule } from 'ng-zorro-antd/tag';
 
 const routes: Route[] = [{path: '**', component: UpdateComponent}];
 

src/app/view/write/write.component.ts

@@ -2,7 +2,7 @@ import {Component, OnDestroy, OnInit} from '@angular/core';
 import {ArticleReq} from '../../class/Article';
 import {ActivatedRoute, Router} from '@angular/router';
 import {ApiService} from '../../api/api.service';
-import {NzMessageService} from 'ng-zorro-antd';
+import { NzMessageService } from 'ng-zorro-antd/message';
 import {User} from '../../class/User';
 import {Tag} from '../../class/Tag';
 import {Title} from '@angular/platform-browser';

src/app/view/write/write.module.ts

@@ -4,18 +4,16 @@ import {WriteComponent} from './write.component';
 import {Route, RouterModule} from '@angular/router';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {PublishFormComponent} from './components/publish-form/publish-form.component';
-import {
-    NzButtonModule,
-    NzCardModule,
-    NzDividerModule,
-    NzFormModule,
-    NzIconModule,
-    NzInputModule,
-    NzModalModule,
-    NzRadioModule,
-    NzSelectModule,
-    NzTagModule
-} from 'ng-zorro-antd';
+import { NzButtonModule } from 'ng-zorro-antd/button';
+import { NzCardModule } from 'ng-zorro-antd/card';
+import { NzDividerModule } from 'ng-zorro-antd/divider';
+import { NzFormModule } from 'ng-zorro-antd/form';
+import { NzIconModule } from 'ng-zorro-antd/icon';
+import { NzInputModule } from 'ng-zorro-antd/input';
+import { NzModalModule } from 'ng-zorro-antd/modal';
+import { NzRadioModule } from 'ng-zorro-antd/radio';
+import { NzSelectModule } from 'ng-zorro-antd/select';
+import { NzTagModule } from 'ng-zorro-antd/tag';
 import {EditableTagModule} from '../admin/components/editable-tag/editable-tag.module';
 
 const routes: Route[] = [

src/environments/environment.ts

@@ -5,7 +5,7 @@
 export const environment = {
     production: false,
     logger: true,
-    host: 'http://127.0.0.1/'
+    host: 'http://127.0.0.1:8080/'
 };
 
 /*

tslint.json

@@ -1,6 +1,7 @@
 {
   "extends": "tslint:recommended",
   "rules": {
+    "nz-secondary-entry-imports": true,
     "array-type": false,
     "arrow-parens": false,
     "deprecation": {
@@ -86,6 +87,7 @@
     "use-pipe-transform-interface": true
   },
   "rulesDirectory": [
-    "codelyzer"
+    "codelyzer",
+    "node_modules/nz-tslint-rules"
   ]
 }