From 561d2b7180765e704db9b8f73060fbdc2fa59407 Mon Sep 17 00:00:00 2001 From: crusader Date: Thu, 14 Jun 2018 13:38:51 +0900 Subject: [PATCH] ing --- @overflow/discovery/subscriber/discovery.subscriber.ts | 1 - @overflow/infra/service/infra.service.ts | 8 ++++---- @overflow/member/service/member.service.ts | 2 -- .../noauth-probe/component/noauth-probe-list.component.ts | 2 +- @overflow/noauth-probe/service/noauth-probe.service.ts | 8 ++++---- @overflow/probe/service/probe-host.service.ts | 8 ++++---- @overflow/probe/service/probe.service.ts | 8 ++------ 7 files changed, 15 insertions(+), 22 deletions(-) diff --git a/@overflow/discovery/subscriber/discovery.subscriber.ts b/@overflow/discovery/subscriber/discovery.subscriber.ts index 1bbfe33..e2fd39a 100644 --- a/@overflow/discovery/subscriber/discovery.subscriber.ts +++ b/@overflow/discovery/subscriber/discovery.subscriber.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; -import { catchError, exhaustMap, map, tap } from 'rxjs/operators'; import { RPCSubscriber } from '@loafer/ng-rpc'; import { LoggerService } from '@loafer/ng-logger'; diff --git a/@overflow/infra/service/infra.service.ts b/@overflow/infra/service/infra.service.ts index 79d4141..8f8b2cf 100644 --- a/@overflow/infra/service/infra.service.ts +++ b/@overflow/infra/service/infra.service.ts @@ -18,14 +18,14 @@ export class InfraService { return this.rpcService.call('InfraService.regist', infra); } - public read(id: string): Observable { - return this.rpcService.call('InfraService.read', id); - } - public registDiscoverd(probeID: number, hosts: Host[], services: Service[]): Observable { return this.rpcService.call('InfraService.registDiscoverd', probeID, hosts, services); } + public read(id: string): Observable { + return this.rpcService.call('InfraService.read', id); + } + public readAllByProbeID(probeID: number, pageParams: PageParams): Observable> { return this.rpcService.call>('InfraService.readAllByProbeID', probeID, pageParams); } diff --git a/@overflow/member/service/member.service.ts b/@overflow/member/service/member.service.ts index 510b680..edc2d60 100644 --- a/@overflow/member/service/member.service.ts +++ b/@overflow/member/service/member.service.ts @@ -40,7 +40,6 @@ export class MemberService { } public sendEmailResetPassword(email: string): Observable { - // return this.rpcService.call('MemberService.sendEmailForPassword', email); return this.restService.request('post', '/account/send_email_pw', { body: { signinID: email, @@ -48,7 +47,6 @@ export class MemberService { }); } public resetPassword(token: string, pw: string, confirmPw: string): Observable { - // return this.rpcService.call('MemberService.sendEmailForPassword', email); return this.restService.request('post', '/account/reset_password', { body: { token: token, diff --git a/@overflow/noauth-probe/component/noauth-probe-list.component.ts b/@overflow/noauth-probe/component/noauth-probe-list.component.ts index 1d29895..feeea16 100644 --- a/@overflow/noauth-probe/component/noauth-probe-list.component.ts +++ b/@overflow/noauth-probe/component/noauth-probe-list.component.ts @@ -102,7 +102,7 @@ export class NoAuthProbeListComponent implements OnInit, OnDestroy { icon: isAccept ? 'fa-check' : 'fa fa-trash', accept: () => { if (isAccept) { - this.noAuthProbeService.acceptNoAuthProbe(selected.id) + this.noAuthProbeService.acceptNoAuthProbe(selected.id, '') .pipe( tap(() => { this.pending$ = of(true); diff --git a/@overflow/noauth-probe/service/noauth-probe.service.ts b/@overflow/noauth-probe/service/noauth-probe.service.ts index 7f789ea..9ea0de3 100644 --- a/@overflow/noauth-probe/service/noauth-probe.service.ts +++ b/@overflow/noauth-probe/service/noauth-probe.service.ts @@ -21,11 +21,11 @@ export class NoAuthProbeService { return this.rpcService.call('NoAuthProbeService.readAllByDomainID', domainID); } - public acceptNoAuthProbe(noAuthProbeID: number): Observable { - return this.rpcService.call('NoAuthProbeService.acceptNoAuthProbe', noAuthProbeID); + public acceptNoAuthProbe(id: number, zoneCIDR: string): Observable { + return this.rpcService.call('NoAuthProbeService.acceptNoAuthProbe', id, zoneCIDR); } - public denyNoauthProbe(noAuthProbeID: number): Observable { - return this.rpcService.call('NoAuthProbeService.denyNoauthProbe', noAuthProbeID); + public denyNoauthProbe(id: number): Observable { + return this.rpcService.call('NoAuthProbeService.denyNoauthProbe', id); } } diff --git a/@overflow/probe/service/probe-host.service.ts b/@overflow/probe/service/probe-host.service.ts index a63b70c..1dedd29 100644 --- a/@overflow/probe/service/probe-host.service.ts +++ b/@overflow/probe/service/probe-host.service.ts @@ -14,6 +14,10 @@ export class ProbeHostService { } + public read(id: number): Observable { + return this.rpcService.call('ProbeHostService.read', id); + } + public readByProbeID(probeID: number): Observable { return this.rpcService.call('ProbeHostService.readByProbeID', probeID); } @@ -22,8 +26,4 @@ export class ProbeHostService { return this.rpcService.call('ProbeHostService.readAllByDomainID', domainID); } - public read(id: number): Observable { - return this.rpcService.call('ProbeHostService.read', id); - } - } diff --git a/@overflow/probe/service/probe.service.ts b/@overflow/probe/service/probe.service.ts index 5a9107a..4a0ad7d 100644 --- a/@overflow/probe/service/probe.service.ts +++ b/@overflow/probe/service/probe.service.ts @@ -17,8 +17,8 @@ export class ProbeService { } - public readAllByDomain(domain: Domain): Observable { - return this.rpcService.call('ProbeService.readAllByDomain', domain); + public readAllByDomainID(domainID: number): Observable { + return this.rpcService.call('ProbeService.readAllByDomainID', domainID); } public read(id: number): Observable { @@ -33,8 +33,4 @@ export class ProbeService { return this.rpcService.call('ProbeService.remove', id); } - public modifyDisplayName(id: number, displayName: string): Observable { - return this.rpcService.call('ProbeService.modifyDisplayName', id, displayName); - } - }