From 19dda63c8accd8c3791e271b229b667a8e1aad20 Mon Sep 17 00:00:00 2001 From: crusader Date: Wed, 5 Sep 2018 15:29:06 +0900 Subject: [PATCH] ing --- @overflow/model/discovery/Host.ts | 1 + @overflow/model/discovery/Port.ts | 5 +++-- @overflow/model/discovery/Service.ts | 1 + @overflow/model/discovery/Zone.ts | 1 + package.json | 2 +- src/app/pages/home/home-page.component.html | 2 +- src/app/pages/home/home-page.component.ts | 4 ++-- src/commons/component/nic-dropdown.component.html | 2 +- src/commons/service/probe.service.ts | 12 +++++++++++- yarn.lock | 6 +++--- 10 files changed, 25 insertions(+), 11 deletions(-) diff --git a/@overflow/model/discovery/Host.ts b/@overflow/model/discovery/Host.ts index d871fc4..4c934f8 100644 --- a/@overflow/model/discovery/Host.ts +++ b/@overflow/model/discovery/Host.ts @@ -12,5 +12,6 @@ export interface Host { zone?: Zone; portList?: Port[]; + discoveredBy?: string; discoveredDate?: Date; } diff --git a/@overflow/model/discovery/Port.ts b/@overflow/model/discovery/Port.ts index 3587a89..6e676cd 100644 --- a/@overflow/model/discovery/Port.ts +++ b/@overflow/model/discovery/Port.ts @@ -7,8 +7,9 @@ export interface Port { portNumber?: number; meta?: Map; - discoveredDate?: Date; - host?: Host; serviceList?: Service[]; + + discoveredBy?: string; + discoveredDate?: Date; } diff --git a/@overflow/model/discovery/Service.ts b/@overflow/model/discovery/Service.ts index 5a66e76..d353c03 100644 --- a/@overflow/model/discovery/Service.ts +++ b/@overflow/model/discovery/Service.ts @@ -9,5 +9,6 @@ export interface Service { port?: Port; + discoveredBy?: string; discoveredDate?: Date; } diff --git a/@overflow/model/discovery/Zone.ts b/@overflow/model/discovery/Zone.ts index a079ca1..6fa988e 100644 --- a/@overflow/model/discovery/Zone.ts +++ b/@overflow/model/discovery/Zone.ts @@ -9,5 +9,6 @@ export interface Zone { mac?: string; meta?: Map; + discoveredBy?: string; discoveredDate?: Date; } diff --git a/package.json b/package.json index 31d7f39..0429418 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@ngrx/schematics": "^6.1.0", "@ngrx/store": "^6.1.0", "@ngrx/store-devtools": "^6.1.0", - "@overflow/rpc-js": "0.0.2", + "@overflow/rpc-js": "0.0.4", "@types/fs-extra": "^5.0.4", "@types/jasmine": "~2.8.6", "@types/jasminewd2": "~2.0.3", diff --git a/src/app/pages/home/home-page.component.html b/src/app/pages/home/home-page.component.html index ccb75df..8d4b3e0 100644 --- a/src/app/pages/home/home-page.component.html +++ b/src/app/pages/home/home-page.component.html @@ -6,7 +6,7 @@
-

overFlow Network Scanner

+

overFlow Scanner


를 이용해 주셔서 감사합니다.
좌측의 버튼을 클릭 하시면 기본 설정으로 스캐닝이 시작 됩니다. 설정의 변경을 원하시면 상단의 설정 영역을 클릭하여 변경이 가능합니다. diff --git a/src/app/pages/home/home-page.component.ts b/src/app/pages/home/home-page.component.ts index a78e122..d313ceb 100644 --- a/src/app/pages/home/home-page.component.ts +++ b/src/app/pages/home/home-page.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core'; import { Observable, Subscription, of } from 'rxjs'; import { catchError, exhaustMap, map, tap, take } from 'rxjs/operators'; -import { ProbeService } from '../../../commons/service/probe.service'; +import { ProbeService, requesterID } from '../../../commons/service/probe.service'; import { Interface } from '@overflow/model/net/nic'; import { Zone, DiscoverHost } from '@overflow/model/discovery'; @@ -63,7 +63,7 @@ export class HomePageComponent implements OnInit { } }; - this.probeService.send('DiscoveryService.DiscoverHost', 'testRequesterID', zone, discoverHost); + this.probeService.send('DiscoveryService.DiscoverHost', requesterID, zone, discoverHost); // this.probeService.call('MachineService.Interfaces').pipe( // map((ifaces: Interface[]) => { diff --git a/src/commons/component/nic-dropdown.component.html b/src/commons/component/nic-dropdown.component.html index 2559749..ce252a5 100644 --- a/src/commons/component/nic-dropdown.component.html +++ b/src/commons/component/nic-dropdown.component.html @@ -15,7 +15,7 @@
- +