Merge branch 'develop' into lmm

src/app/services/httpInterceptor.service.ts

@@ -7,9 +7,11 @@ import {
 } from "@angular/common/http";
 import { Observable } from "rxjs";
 import { tap } from "rxjs/operators";
+import { Router } from '@angular/router';
+import { NzMessageService } from 'ng-zorro-antd';
 // const ignoreToken = ['login', 'logout', 'table'];
 export class HttpInterceptorService implements HttpInterceptor {
-  constructor() {}
+  constructor(private router: Router, private message: NzMessageService) {}
   intercept(
     req: HttpRequest<any>,
     next: HttpHandler
@@ -32,6 +34,11 @@ export class HttpInterceptorService implements HttpInterceptor {
         (event) => {
           if (event instanceof HttpResponse) {
             // console.log(event);
+            if(event.body == 520){
+              this.message.info('登录失效，请重新登录！').onClose!.subscribe(() => {
+                this.router.navigate(['/login']);
+              })
+            }
           }
         },
         (error) => {

upload/development.js

@@ -35,9 +35,13 @@ function connectSSh() {
 function runTask() {
   //打包完成
   if (shell.exec(`npm run build`).code == 0) {
-    console.log("-----打包成功-----");
-    //提交上传
-    connectSSh();
+    if (shell.exec(`find dist -name '*.js' -print0 | xargs -0 gzip -k`).code == 0) {
+      if (shell.exec(`find dist -name '*.css' -print0 | xargs -0 gzip -k`).code == 0) {
+        console.log("-----打包成功-----");
+        //提交上传
+        connectSSh();
+      }
+    }
   }
 }
 runTask()