overflow_backup_2018_0455/overflow_app
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/ts/meta/api/model/MetaCrawler.ts
#	src/ts/meta/api/model/MetaCrawlerInputItem.ts
#	src/ts/meta/api/model/MetaInfraType.ts
#	src/ts/meta/api/model/MetaInfraVendor.ts
#	src/ts/meta/api/model/MetaInputType.ts
#	src/ts/meta/api/model/MetaMemberStatus.ts
#	src/ts/meta/api/model/MetaNoAuthProbeStatus.ts
#	src/ts/meta/api/model/MetaNotification.ts
#	src/ts/meta/api/model/MetaProbeArchitecture.ts
#	src/ts/meta/api/model/MetaProbePackage.ts
#	src/ts/meta/api/model/MetaVendorCrawlerSensorItem.ts
This commit is contained in:
geek 2017-07-03 16:29:42 +09:00
commit dd523dec25
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ts/apikey/api/model/ApiKey.ts
View File

@ -2,9 +2,9 @@
import Domain from 'domain/api/model/Domain'; import Domain from 'domain/api/model/Domain';
export interface ApiKey { export interface ApiKey {
id: number; id?: number;
apiKey: string; apiKey: string;
createDate: Date; createDate?: Date;
domain: Domain; domain: Domain;
} }

6
src/ts/discovery/api/model/Host.ts
View File

@ -1,14 +1,14 @@
import Port from './Port'; import Port from './Port';
interface Host { interface Host {
id: number; id?: number;
ip: number; ip: number;
mac: number; mac: number;
createDate: Date; createDate?: Date;
updateDate: Date; updateDate: Date;
os: string; os: string;
target: boolean; target: boolean;
ports: Port[]; ports?: Port[];
} }
export default Host; export default Host;

6
src/ts/discovery/api/model/Port.ts
View File

@ -3,12 +3,12 @@ import Service from './Service';
import PortType from './PortType'; import PortType from './PortType';
interface Port { interface Port {
id: number; id?: number;
host: Host; host: Host;
portType: PortType; portType: PortType;
portNumber: number; portNumber: number;
services: Service[]; services?: Service[];
createDate: Date; createDate?: Date;
updateDate: Date; updateDate: Date;
} }