[新增]摄像头连接后端;定时刷新token

angular.json

@@ -46,8 +46,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "500kb",
-                  "maximumError": "1mb"
+                  "maximumWarning": "5mb",
+                  "maximumError": "5mb"
                 },
                 {
                   "type": "anyComponentStyle",

src/app/app.module.ts

@@ -8,7 +8,6 @@ import { FormsModule } from '@angular/forms';
 import { HttpClientModule } from '@angular/common/http';
 import { httpInterceptorProviders } from './http-interceptors/index'
 import { CacheTokenService } from './service/cache-token.service'
-import { CookieService } from 'ngx-cookie-service';//cookie插件
 import { NzNotificationModule } from 'ng-zorro-antd/notification';
 import { NzMessageModule } from 'ng-zorro-antd/message';
 import { TreeService } from './service/tree.service';
@@ -28,7 +27,7 @@ import { CustomReuseStrategy } from './CustomReuseStrategy';
     NzNotificationModule,
     NzMessageModule
   ],
-  providers: [httpInterceptorProviders, CacheTokenService, TreeService, CookieService,
+  providers: [httpInterceptorProviders, CacheTokenService, TreeService,
     { provide: RouteReuseStrategy, useClass: CustomReuseStrategy }],
   bootstrap: [AppComponent]
 })

src/app/auth.guard.ts

@@ -1,14 +1,13 @@
 import { Component, OnInit, Inject } from '@angular/core';
 import { Injectable } from '@angular/core';
 import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router } from '@angular/router';
-import { CookieService } from 'ngx-cookie-service';
 
 @Injectable({
     providedIn: 'root'
 })
 export class AuthGuard implements CanActivate {
 
-    constructor(private router: Router,private cookieService: CookieService) {
+    constructor(private router: Router) {
 
     }
 
@@ -24,7 +23,7 @@ export class AuthGuard implements CanActivate {
     checkLogin(): boolean {
         // console.log('xxxxxxxxxxxx')
         // 判断本地有没有token
-        const token = this.cookieService.get("token") || sessionStorage.getItem('token');
+        const token = sessionStorage.getItem('token');
 
         // 如果有token,允许访问
         if (token) { return true; }

src/app/http-interceptors/base-interceptor.ts

@@ -7,7 +7,6 @@ import { throwError } from 'rxjs'
 import { catchError } from 'rxjs/operators';
 import { Router } from '@angular/router'
 import { CacheTokenService } from '../service/cache-token.service'
-import { CookieService } from 'ngx-cookie-service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 //baseurl
 // const baseurl = 'http://39.106.78.171:8008';
@@ -15,7 +14,7 @@ import { NzMessageService } from 'ng-zorro-antd/message';
 @Injectable()
 export class BaseInterceptor implements HttpInterceptor {
 
-  constructor(private router: Router, public token: CacheTokenService, private cookieService: CookieService, private message: NzMessageService) { }
+  constructor(private router: Router, public token: CacheTokenService, private message: NzMessageService) { }
 
   intercept(req: any, next: HttpHandler) {
 
@@ -33,7 +32,7 @@ export class BaseInterceptor implements HttpInterceptor {
     });
     if (!req.cancelToken) {
       /*获取token*/
-      let token = this.cookieService.get("token")
+      let token = sessionStorage.getItem('token')
       /*此处设置额外请求头，token令牌*/
       newReq.headers =
         newReq.headers.set('Authorization', `Bearer ${token}`)
@@ -56,10 +55,7 @@ export class BaseInterceptor implements HttpInterceptor {
     if (error.status === 401 || error.status === 614) {
       this.token.delete()
       sessionStorage.clear()
-      // window.localStorage.clear()
       localStorage.removeItem("isautologin")
-      this.cookieService.set("token", '', new Date(new Date().getTime() + 1), '/')
-      this.cookieService.set("refreshToken", '', new Date(new Date().getTime() + 1), '/')
       this.message.create('error', `用户认证信息过期,请重新登录!`);
       this.router.navigate(['/login'])
     }

src/app/pages/login/login.component.ts

@@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
 import { Router, ActivatedRoute } from '@angular/router'
 import { CacheTokenService } from '../../service/cache-token.service'//引入服务
-import { CookieService } from 'ngx-cookie-service';//cookie插件
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Base64 } from 'js-base64';
@@ -17,7 +16,7 @@ import { NzNotificationService } from 'ng-zorro-antd/notification';
 export class LoginComponent implements OnInit {
 
   validateForm!: FormGroup;
-  constructor(private http: HttpClient, private router: Router, public token: CacheTokenService, private cookieService: CookieService, private fb: FormBuilder, private message: NzMessageService) { }
+  constructor(private http: HttpClient, private router: Router, public token: CacheTokenService, private fb: FormBuilder, private message: NzMessageService) { }
 
   ngOnInit() {
     this.validateForm = this.fb.group({
@@ -107,14 +106,11 @@ export class LoginComponent implements OnInit {
         this.autoLogin()
         sessionStorage.setItem("token", data.token);
         sessionStorage.setItem("refreshToken", data.refreshToken);
-        this.cookieService.set("token", data.token, null, '/');
-        this.cookieService.set("refreshToken", data.refreshToken, null, '/');
         this.router.navigate(['/system/organization'])
         this.message.create('success', `登录成功`);
-      },
-      (err) => {
-        this.isLoading = false;
-        this.message.create('error', err.error.error.details);
+
+        //调用服务中的function刷新token
+        this.token.startUp()
       }
     )
   }

src/app/service/cache-token.service.ts

@@ -1,13 +1,12 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
-import { CookieService } from 'ngx-cookie-service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class CacheTokenService {
 
-  constructor(private http: HttpClient, private cookieService: CookieService) { }
+  constructor(private http: HttpClient) { }
 
   public timer: number | undefined;
 
@@ -15,15 +14,14 @@ export class CacheTokenService {
   startUp = (): void => {
     window.clearInterval(this.timer)
     this.timer = window.setInterval(() => {
-      var token = this.cookieService.get("token");
-      var refreshToken = this.cookieService.get("refreshToken");
-      this.http.post('/api/CompanyAccount/RefreshToken', {
+      var token = sessionStorage.getItem("token");
+      var refreshToken = sessionStorage.getItem("refreshToken");
+      this.http.post('/api/Accounts/RefreshToken', {
         token: token,
         refreshToken: refreshToken
       }).subscribe((data: any) => {
         sessionStorage.setItem("token", data.token);
-        this.cookieService.set("token", data.token, undefined, '/');
-        this.cookieService.set("refreshToken", data.refreshToken, undefined, '/');
+        sessionStorage.setItem("refreshToken", data.refreshToken);
       })
     }, 18 * 60 * 1000)
   }

src/app/system-management/host-config/host-config.component.ts

@@ -5,8 +5,9 @@ import { NzFormTooltipIcon } from 'ng-zorro-antd/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { AddcameraComponent } from './addcamera/addcamera.component';
 import { NzMessageService } from 'ng-zorro-antd/message';
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { EditcameraComponent } from './editcamera/editcamera.component';
+import { catchError, tap } from 'rxjs/operators';
 interface Camera {
   name: string;
   user: string;
@@ -132,7 +133,21 @@ export class HostConfigComponent implements OnInit {
   }
 
   connect() {
-    this.router.navigate(['/system/host/camera/imageList'])
-  }
+    let ids = []
+    this.listOfData.forEach((item: any) => {
+      ids.push(item.id)
+    })
+    this.http.get('/api/Cameras/Statuses', {
+      params: { ids: ids }
+    }).subscribe({
+      next: (data) => {
+        console.log('连接状态', data)
+      },
+      error: (err) => {
+        console.log('连接失败', err)
+      },
+      // complete: () => console.log('complete!'), // not called
+    })
 
   }
+}

src/app/system-management/navigation/navigation.component.ts

@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
+import { CacheTokenService } from 'src/app/service/cache-token.service';
 
 @Component({
   selector: 'app-navigation',
@@ -8,11 +9,12 @@ import { Router } from '@angular/router';
 })
 export class NavigationComponent implements OnInit {
 
-  constructor(private router: Router) { }
+  constructor(private router: Router, public token: CacheTokenService) { }
 
   ngOnInit(): void {
   }
   signOut() {
+    this.token.delete()
     this.router.navigate(['/login'])
   }
 }