From b854cbb766068645c42940956a262cbca341430b Mon Sep 17 00:00:00 2001 From: geek Date: Wed, 2 May 2018 17:03:39 +0900 Subject: [PATCH] ing --- {src/model => model}/alert/Alert.ts | 1 - {src/model => model}/alert/AlertMetric.ts | 0 {src/model => model}/alert/AlertSystem.ts | 1 - {src/model => model}/alert/index.ts | 0 {src/model => model}/apikey/ApiKey.ts | 5 ++- {src/model => model}/auth/AuthCrawler.ts | 6 ++-- {src/model => model}/commons/PageParams.ts | 3 +- model/discovery/CryptoType.ts | 1 + .../model => model}/discovery/DiscoverHost.ts | 0 .../model => model}/discovery/DiscoverPort.ts | 0 .../discovery/DiscoverService.ts | 0 .../model => model}/discovery/DiscoverZone.ts | 0 .../discovery/DiscoveryStartInfo.ts | 0 {src/model => model}/discovery/Host.ts | 0 {src/model => model}/discovery/Port.ts | 0 model/discovery/PortType.ts | 1 + {src/model => model}/discovery/Service.ts | 0 {src/model => model}/discovery/Zone.ts | 0 {src/model => model}/discovery/index.ts | 0 {src/model => model}/domain/Domain.ts | 0 {src/model => model}/domain/DomainMember.ts | 2 +- {src/model => model}/domain/index.ts | 0 {src/model => model}/email/EmailAuth.ts | 2 +- model/history/History.ts | 14 ++++++++ model/infra/Infra.ts | 11 ++++++ {src/model => model}/infra/InfraHost.ts | 8 ----- model/infra/InfraMachine.ts | 6 ++++ model/infra/InfraOS.ts | 9 +++++ .../infra/InfraOSApplication.ts | 8 ----- {src/model => model}/infra/InfraOSDaemon.ts | 8 ----- model/infra/InfraOSPort.ts | 11 ++++++ model/infra/InfraService.ts | 11 ++++++ {src/model => model}/infra/index.ts | 0 model/member/Member.ts | 14 ++++++++ {src/model => model}/member/MemberStatus.ts | 0 model/member/MemberTotp.ts | 10 ++++++ {src/model => model}/member/index.ts | 0 .../crawler => model/meta}/MetaCrawler.ts | 7 ---- model/meta/MetaCrawlerInputItem.ts | 16 +++++++++ .../meta}/MetaHistoryType.ts | 6 ---- .../meta}/MetaInfraType.ts | 6 ---- .../meta}/MetaInfraVendor.ts | 10 +----- .../meta}/MetaInputType.ts | 6 ---- .../meta}/MetaMemberStatus.ts | 4 --- .../meta}/MetaNoAuthProbeStatus.ts | 5 --- model/meta/MetaNotification.ts | 7 ++++ .../meta}/MetaProbeArchitecture.ts | 6 ---- .../probe-os => model/meta}/MetaProbeOs.ts | 6 ---- model/meta/MetaProbePackage.ts | 11 ++++++ .../meta}/MetaProbeStatus.ts | 5 --- model/meta/MetaProbeTaskType.ts | 7 ++++ model/meta/MetaProbeVersion.ts | 6 ++++ model/meta/MetaSensorDisplayItem.ts | 16 +++++++++ model/meta/MetaSensorDisplayMapping.ts | 8 +++++ model/meta/MetaSensorItem.ts | 7 ++++ model/meta/MetaSensorItemKey.ts | 14 ++++++++ model/meta/MetaSensorItemType.ts | 7 ++++ model/meta/MetaSensorItemUnit.ts | 7 ++++ .../meta}/MetaSensorStatus.ts | 5 --- model/meta/MetaVendorCrawler.ts | 9 +++++ .../meta}/MetaVendorCrawlerSensorItem.ts | 5 ++- model/meta/index.ts | 25 +++++++++++++ model/noauth/NoAuthProbe.ts | 14 ++++++++ {src/model => model}/noauth/index.ts | 0 model/notification/Notification.ts | 11 ++++++ {src/model => model}/notification/index.ts | 0 model/probe/Probe.ts | 17 +++++++++ model/probe/ProbeHost.ts | 8 +++++ model/probe/ProbeTask.ts | 14 ++++++++ {src/model => model}/probe/index.ts | 0 model/sensor-item/SensorItem.ts | 9 +++++ model/sensor-item/SensorItemDependency.ts | 7 ++++ model/sensor/Sensor.ts | 13 +++++++ .../sensor/SensorRegistInfo.ts | 6 ++-- {src/model => model}/sensor/index.ts | 0 model/target/Target.ts | 9 +++++ {src/model => model}/target/index.ts | 0 src/model/discovery/CryptoType.ts | 3 -- src/model/discovery/PortType.ts | 8 ----- src/model/history/History.ts | 14 -------- src/model/infra/Infra.ts | 21 ----------- src/model/infra/InfraMachine.ts | 12 ------- src/model/infra/InfraOS.ts | 18 ---------- src/model/infra/InfraOSPort.ts | 21 ----------- src/model/infra/InfraService.ts | 21 ----------- src/model/member/Member.ts | 26 -------------- src/model/member/MemberTotp.ts | 20 ----------- .../MetaCrawlerInputItem.ts | 31 ---------------- .../meta/model-temp/MetaVendorCrawler.ts | 10 ------ src/model/meta/model-temp/index.ts | 0 .../meta/notification/MetaNotification.ts | 16 --------- .../meta/probe-package/MetaProbePackage.ts | 20 ----------- .../meta/probe-task-type/MetaProbeTaskType.ts | 15 -------- .../meta/probe-version/MetaProbeVersion.ts | 12 ------- .../MetaSensorDisplayItem.ts | 28 --------------- .../MetaSensorDisplayMapping.ts | 8 ----- .../meta/sensor-item-key/MetaSensorItemKey.ts | 24 ------------- .../sensor-item-type/MetaSensorItemType.ts | 14 -------- .../sensor-item-unit/MetaSensorItemUnit.ts | 14 -------- src/model/meta/sensor-item/MetaSensorItem.ts | 17 --------- .../MetaVendorCrawlerSensorItem.ts | 12 ------- .../meta/vendor-crawler/MetaVendorCrawler.ts | 10 ------ src/model/noauth/NoAuthProbe.ts | 36 ------------------- src/model/notification/Notification.ts | 23 ------------ src/model/probe/Probe.ts | 35 ------------------ src/model/probe/ProbeHost.ts | 15 -------- src/model/probe/ProbeTask.ts | 26 -------------- src/model/sensor-item/SensorItem.ts | 17 --------- src/model/sensor-item/SensorItemDependency.ts | 14 -------- src/model/sensor/Sensor.ts | 25 ------------- src/model/target/Target.ts | 20 ----------- 111 files changed, 343 insertions(+), 714 deletions(-) rename {src/model => model}/alert/Alert.ts (98%) rename {src/model => model}/alert/AlertMetric.ts (100%) rename {src/model => model}/alert/AlertSystem.ts (99%) rename {src/model => model}/alert/index.ts (100%) rename {src/model => model}/apikey/ApiKey.ts (72%) rename {src/model => model}/auth/AuthCrawler.ts (58%) rename {src/model => model}/commons/PageParams.ts (98%) create mode 100644 model/discovery/CryptoType.ts rename {src/model => model}/discovery/DiscoverHost.ts (100%) rename {src/model => model}/discovery/DiscoverPort.ts (100%) rename {src/model => model}/discovery/DiscoverService.ts (100%) rename {src/model => model}/discovery/DiscoverZone.ts (100%) rename {src/model => model}/discovery/DiscoveryStartInfo.ts (100%) rename {src/model => model}/discovery/Host.ts (100%) rename {src/model => model}/discovery/Port.ts (100%) create mode 100644 model/discovery/PortType.ts rename {src/model => model}/discovery/Service.ts (100%) rename {src/model => model}/discovery/Zone.ts (100%) rename {src/model => model}/discovery/index.ts (100%) rename {src/model => model}/domain/Domain.ts (100%) rename {src/model => model}/domain/DomainMember.ts (78%) rename {src/model => model}/domain/index.ts (100%) rename {src/model => model}/email/EmailAuth.ts (79%) create mode 100644 model/history/History.ts create mode 100644 model/infra/Infra.ts rename {src/model => model}/infra/InfraHost.ts (53%) create mode 100644 model/infra/InfraMachine.ts create mode 100644 model/infra/InfraOS.ts rename {src/model => model}/infra/InfraOSApplication.ts (51%) rename {src/model => model}/infra/InfraOSDaemon.ts (51%) create mode 100644 model/infra/InfraOSPort.ts create mode 100644 model/infra/InfraService.ts rename {src/model => model}/infra/index.ts (100%) create mode 100644 model/member/Member.ts rename {src/model => model}/member/MemberStatus.ts (100%) create mode 100644 model/member/MemberTotp.ts rename {src/model => model}/member/index.ts (100%) rename {src/model/meta/crawler => model/meta}/MetaCrawler.ts (83%) create mode 100644 model/meta/MetaCrawlerInputItem.ts rename {src/model/meta/history-type => model/meta}/MetaHistoryType.ts (65%) rename {src/model/meta/infra-type => model/meta}/MetaInfraType.ts (69%) rename {src/model/meta/infra-vendor => model/meta}/MetaInfraVendor.ts (81%) rename {src/model/meta/input-type => model/meta}/MetaInputType.ts (65%) rename {src/model/meta/member-status => model/meta}/MetaMemberStatus.ts (68%) rename {src/model/meta/noauth-probe-status => model/meta}/MetaNoAuthProbeStatus.ts (64%) create mode 100644 model/meta/MetaNotification.ts rename {src/model/meta/probe-architecture => model/meta}/MetaProbeArchitecture.ts (58%) rename {src/model/meta/probe-os => model/meta}/MetaProbeOs.ts (63%) create mode 100644 model/meta/MetaProbePackage.ts rename {src/model/meta/probe-status => model/meta}/MetaProbeStatus.ts (62%) create mode 100644 model/meta/MetaProbeTaskType.ts create mode 100644 model/meta/MetaProbeVersion.ts create mode 100644 model/meta/MetaSensorDisplayItem.ts create mode 100644 model/meta/MetaSensorDisplayMapping.ts create mode 100644 model/meta/MetaSensorItem.ts create mode 100644 model/meta/MetaSensorItemKey.ts create mode 100644 model/meta/MetaSensorItemType.ts create mode 100644 model/meta/MetaSensorItemUnit.ts rename {src/model/meta/sensor-status => model/meta}/MetaSensorStatus.ts (62%) create mode 100644 model/meta/MetaVendorCrawler.ts rename {src/model/meta/model-temp => model/meta}/MetaVendorCrawlerSensorItem.ts (58%) create mode 100644 model/meta/index.ts create mode 100644 model/noauth/NoAuthProbe.ts rename {src/model => model}/noauth/index.ts (100%) create mode 100644 model/notification/Notification.ts rename {src/model => model}/notification/index.ts (100%) create mode 100644 model/probe/Probe.ts create mode 100644 model/probe/ProbeHost.ts create mode 100644 model/probe/ProbeTask.ts rename {src/model => model}/probe/index.ts (100%) create mode 100644 model/sensor-item/SensorItem.ts create mode 100644 model/sensor-item/SensorItemDependency.ts create mode 100644 model/sensor/Sensor.ts rename {src/model => model}/sensor/SensorRegistInfo.ts (53%) rename {src/model => model}/sensor/index.ts (100%) create mode 100644 model/target/Target.ts rename {src/model => model}/target/index.ts (100%) delete mode 100644 src/model/discovery/CryptoType.ts delete mode 100644 src/model/discovery/PortType.ts delete mode 100644 src/model/history/History.ts delete mode 100644 src/model/infra/Infra.ts delete mode 100644 src/model/infra/InfraMachine.ts delete mode 100644 src/model/infra/InfraOS.ts delete mode 100644 src/model/infra/InfraOSPort.ts delete mode 100644 src/model/infra/InfraService.ts delete mode 100644 src/model/member/Member.ts delete mode 100644 src/model/member/MemberTotp.ts delete mode 100644 src/model/meta/crawler-input-item/MetaCrawlerInputItem.ts delete mode 100644 src/model/meta/model-temp/MetaVendorCrawler.ts delete mode 100644 src/model/meta/model-temp/index.ts delete mode 100644 src/model/meta/notification/MetaNotification.ts delete mode 100644 src/model/meta/probe-package/MetaProbePackage.ts delete mode 100644 src/model/meta/probe-task-type/MetaProbeTaskType.ts delete mode 100644 src/model/meta/probe-version/MetaProbeVersion.ts delete mode 100644 src/model/meta/sensor-display-item/MetaSensorDisplayItem.ts delete mode 100644 src/model/meta/sensor-display-mapping/MetaSensorDisplayMapping.ts delete mode 100644 src/model/meta/sensor-item-key/MetaSensorItemKey.ts delete mode 100644 src/model/meta/sensor-item-type/MetaSensorItemType.ts delete mode 100644 src/model/meta/sensor-item-unit/MetaSensorItemUnit.ts delete mode 100644 src/model/meta/sensor-item/MetaSensorItem.ts delete mode 100644 src/model/meta/vendor-crawler-sensor-item/MetaVendorCrawlerSensorItem.ts delete mode 100644 src/model/meta/vendor-crawler/MetaVendorCrawler.ts delete mode 100644 src/model/noauth/NoAuthProbe.ts delete mode 100644 src/model/notification/Notification.ts delete mode 100644 src/model/probe/Probe.ts delete mode 100644 src/model/probe/ProbeHost.ts delete mode 100644 src/model/probe/ProbeTask.ts delete mode 100644 src/model/sensor-item/SensorItem.ts delete mode 100644 src/model/sensor-item/SensorItemDependency.ts delete mode 100644 src/model/sensor/Sensor.ts delete mode 100644 src/model/target/Target.ts diff --git a/src/model/alert/Alert.ts b/model/alert/Alert.ts similarity index 98% rename from src/model/alert/Alert.ts rename to model/alert/Alert.ts index 5b4527a..6ac3827 100644 --- a/src/model/alert/Alert.ts +++ b/model/alert/Alert.ts @@ -1,5 +1,4 @@ export interface Alert { created: string; msg: string; - } \ No newline at end of file diff --git a/src/model/alert/AlertMetric.ts b/model/alert/AlertMetric.ts similarity index 100% rename from src/model/alert/AlertMetric.ts rename to model/alert/AlertMetric.ts diff --git a/src/model/alert/AlertSystem.ts b/model/alert/AlertSystem.ts similarity index 99% rename from src/model/alert/AlertSystem.ts rename to model/alert/AlertSystem.ts index 933e283..494d31a 100644 --- a/src/model/alert/AlertSystem.ts +++ b/model/alert/AlertSystem.ts @@ -1,6 +1,5 @@ import {Alert} from './Alert'; - export interface AlertSystem extends Alert { status?: string; // test } diff --git a/src/model/alert/index.ts b/model/alert/index.ts similarity index 100% rename from src/model/alert/index.ts rename to model/alert/index.ts diff --git a/src/model/apikey/ApiKey.ts b/model/apikey/ApiKey.ts similarity index 72% rename from src/model/apikey/ApiKey.ts rename to model/apikey/ApiKey.ts index 62c771a..df50704 100644 --- a/src/model/apikey/ApiKey.ts +++ b/model/apikey/ApiKey.ts @@ -1,9 +1,8 @@ -import { Domain } from "model/domain"; - +import {Domain} from '../domain'; export interface ApiKey { id?: number; apiKey?: string; createDate?: Date; domain?: Domain; -} \ No newline at end of file +} diff --git a/src/model/auth/AuthCrawler.ts b/model/auth/AuthCrawler.ts similarity index 58% rename from src/model/auth/AuthCrawler.ts rename to model/auth/AuthCrawler.ts index 768f2aa..775e833 100644 --- a/src/model/auth/AuthCrawler.ts +++ b/model/auth/AuthCrawler.ts @@ -1,5 +1,5 @@ -import { MetaCrawler } from "model/meta/crawler/MetaCrawler"; -import { Target } from "model/target"; +import {Target} from '../target'; +import {MetaCrawler} from '../meta'; export interface AuthCrawler { id?: number; @@ -7,4 +7,4 @@ export interface AuthCrawler { target?: Target; authJson?: string; createDate?: Date; -} \ No newline at end of file +} diff --git a/src/model/commons/PageParams.ts b/model/commons/PageParams.ts similarity index 98% rename from src/model/commons/PageParams.ts rename to model/commons/PageParams.ts index fcb5c2f..7d75951 100644 --- a/src/model/commons/PageParams.ts +++ b/model/commons/PageParams.ts @@ -1,7 +1,6 @@ - export interface PageParams { pageNo: number; countPerPage: number; sortCol: string; sortDirection: string; -} \ No newline at end of file +} diff --git a/model/discovery/CryptoType.ts b/model/discovery/CryptoType.ts new file mode 100644 index 0000000..d1de7d3 --- /dev/null +++ b/model/discovery/CryptoType.ts @@ -0,0 +1 @@ +export type CryptoType = "TLS"; diff --git a/src/model/discovery/DiscoverHost.ts b/model/discovery/DiscoverHost.ts similarity index 100% rename from src/model/discovery/DiscoverHost.ts rename to model/discovery/DiscoverHost.ts diff --git a/src/model/discovery/DiscoverPort.ts b/model/discovery/DiscoverPort.ts similarity index 100% rename from src/model/discovery/DiscoverPort.ts rename to model/discovery/DiscoverPort.ts diff --git a/src/model/discovery/DiscoverService.ts b/model/discovery/DiscoverService.ts similarity index 100% rename from src/model/discovery/DiscoverService.ts rename to model/discovery/DiscoverService.ts diff --git a/src/model/discovery/DiscoverZone.ts b/model/discovery/DiscoverZone.ts similarity index 100% rename from src/model/discovery/DiscoverZone.ts rename to model/discovery/DiscoverZone.ts diff --git a/src/model/discovery/DiscoveryStartInfo.ts b/model/discovery/DiscoveryStartInfo.ts similarity index 100% rename from src/model/discovery/DiscoveryStartInfo.ts rename to model/discovery/DiscoveryStartInfo.ts diff --git a/src/model/discovery/Host.ts b/model/discovery/Host.ts similarity index 100% rename from src/model/discovery/Host.ts rename to model/discovery/Host.ts diff --git a/src/model/discovery/Port.ts b/model/discovery/Port.ts similarity index 100% rename from src/model/discovery/Port.ts rename to model/discovery/Port.ts diff --git a/model/discovery/PortType.ts b/model/discovery/PortType.ts new file mode 100644 index 0000000..5338af5 --- /dev/null +++ b/model/discovery/PortType.ts @@ -0,0 +1 @@ +export type PortType = 'TCP' | 'UDP' | 'TLS'; diff --git a/src/model/discovery/Service.ts b/model/discovery/Service.ts similarity index 100% rename from src/model/discovery/Service.ts rename to model/discovery/Service.ts diff --git a/src/model/discovery/Zone.ts b/model/discovery/Zone.ts similarity index 100% rename from src/model/discovery/Zone.ts rename to model/discovery/Zone.ts diff --git a/src/model/discovery/index.ts b/model/discovery/index.ts similarity index 100% rename from src/model/discovery/index.ts rename to model/discovery/index.ts diff --git a/src/model/domain/Domain.ts b/model/domain/Domain.ts similarity index 100% rename from src/model/domain/Domain.ts rename to model/domain/Domain.ts diff --git a/src/model/domain/DomainMember.ts b/model/domain/DomainMember.ts similarity index 78% rename from src/model/domain/DomainMember.ts rename to model/domain/DomainMember.ts index 582eddf..506c931 100644 --- a/src/model/domain/DomainMember.ts +++ b/model/domain/DomainMember.ts @@ -1,5 +1,5 @@ import { Domain } from './Domain'; -import { Member } from 'model/member'; +import {Member} from '../member'; export interface DomainMember { id?: number; diff --git a/src/model/domain/index.ts b/model/domain/index.ts similarity index 100% rename from src/model/domain/index.ts rename to model/domain/index.ts diff --git a/src/model/email/EmailAuth.ts b/model/email/EmailAuth.ts similarity index 79% rename from src/model/email/EmailAuth.ts rename to model/email/EmailAuth.ts index 9f361fd..61566f0 100644 --- a/src/model/email/EmailAuth.ts +++ b/model/email/EmailAuth.ts @@ -1,4 +1,4 @@ -import { Member } from "model/member"; +import {Member} from '../member'; export interface EmailAuth { id?: number; diff --git a/model/history/History.ts b/model/history/History.ts new file mode 100644 index 0000000..850a105 --- /dev/null +++ b/model/history/History.ts @@ -0,0 +1,14 @@ +import { MetaHistoryType } from '../meta'; +import {Probe} from '../probe'; +import {Member} from '../member'; +import {Domain} from '../domain'; + +export interface History { + id?: number; + createDate?: Date; + type?: MetaHistoryType; + message?: string; + probe?: Probe; + member?: Member; + domain?: Domain; +} diff --git a/model/infra/Infra.ts b/model/infra/Infra.ts new file mode 100644 index 0000000..7c82c9e --- /dev/null +++ b/model/infra/Infra.ts @@ -0,0 +1,11 @@ +import {MetaInfraType} from '../meta'; +import {Probe} from '../probe'; +import {Target} from '../target'; + +export interface Infra { + id?: number; + infraType?: MetaInfraType; + createDate?: Date; + probe?: Probe; + target?: Target; +} \ No newline at end of file diff --git a/src/model/infra/InfraHost.ts b/model/infra/InfraHost.ts similarity index 53% rename from src/model/infra/InfraHost.ts rename to model/infra/InfraHost.ts index 5530f4f..f955ee9 100644 --- a/src/model/infra/InfraHost.ts +++ b/model/infra/InfraHost.ts @@ -1,14 +1,6 @@ import { InfraOS } from './InfraOS'; import { Infra } from './Infra'; -// export interface InfraHost extends Infra { -// // id?: number; -// os?: InfraOS; -// ip?: number; -// mac?: number; -// createDate?: Date; -// } - export interface InfraHost extends Infra { os?: InfraOS; ipv4?: string; diff --git a/model/infra/InfraMachine.ts b/model/infra/InfraMachine.ts new file mode 100644 index 0000000..f91bea9 --- /dev/null +++ b/model/infra/InfraMachine.ts @@ -0,0 +1,6 @@ +import { Infra } from './Infra'; + + +export interface InfraMachine extends Infra { + meta?: string; +} diff --git a/model/infra/InfraOS.ts b/model/infra/InfraOS.ts new file mode 100644 index 0000000..6efee9b --- /dev/null +++ b/model/infra/InfraOS.ts @@ -0,0 +1,9 @@ +import { InfraMachine } from './InfraMachine'; +import { Infra } from './Infra'; +import {MetaInfraVendor} from '../meta'; + +export interface InfraOS extends Infra { + machine?: InfraMachine; + meta?: string; + vendor?: MetaInfraVendor; +} \ No newline at end of file diff --git a/src/model/infra/InfraOSApplication.ts b/model/infra/InfraOSApplication.ts similarity index 51% rename from src/model/infra/InfraOSApplication.ts rename to model/infra/InfraOSApplication.ts index c92f9e9..b60c9f2 100644 --- a/src/model/infra/InfraOSApplication.ts +++ b/model/infra/InfraOSApplication.ts @@ -1,14 +1,6 @@ - import { InfraOS } from './InfraOS'; import { Infra } from './Infra'; -// export interface InfraOSApplication extends Infra { -// // id?: number; -// os?: InfraOS; -// name?: string; -// createDate?: Date; -// } - export interface InfraOSApplication extends Infra { os?: InfraOS; name?: string; diff --git a/src/model/infra/InfraOSDaemon.ts b/model/infra/InfraOSDaemon.ts similarity index 51% rename from src/model/infra/InfraOSDaemon.ts rename to model/infra/InfraOSDaemon.ts index 9b2d292..3659434 100644 --- a/src/model/infra/InfraOSDaemon.ts +++ b/model/infra/InfraOSDaemon.ts @@ -1,14 +1,6 @@ import { InfraOS } from './InfraOS'; import { Infra } from './Infra'; -// export interface InfraOSDaemon extends Infra { -// // id?: number; -// os?: InfraOS; -// name?: string; -// createDate?: Date; -// } - - export interface InfraOSDaemon extends Infra { os?: InfraOS; name?: string; diff --git a/model/infra/InfraOSPort.ts b/model/infra/InfraOSPort.ts new file mode 100644 index 0000000..894215d --- /dev/null +++ b/model/infra/InfraOSPort.ts @@ -0,0 +1,11 @@ +import { InfraOS } from './InfraOS'; +import { Infra } from './Infra'; +import {MetaInfraVendor} from '../meta'; + +export interface InfraOSPort extends Infra { + os?: InfraOS; + port?: number; + portType?: string; + vendor?: MetaInfraVendor; + tlsType?: boolean; +} \ No newline at end of file diff --git a/model/infra/InfraService.ts b/model/infra/InfraService.ts new file mode 100644 index 0000000..bdb7f2b --- /dev/null +++ b/model/infra/InfraService.ts @@ -0,0 +1,11 @@ +import { InfraHost } from './InfraHost'; +import { Infra } from './Infra'; +import {MetaInfraVendor} from '../meta'; + +export interface InfraService extends Infra { + host?: InfraHost; + portType?: string; + port?: number; + vendor?: MetaInfraVendor; + tlsType?: boolean; +} \ No newline at end of file diff --git a/src/model/infra/index.ts b/model/infra/index.ts similarity index 100% rename from src/model/infra/index.ts rename to model/infra/index.ts diff --git a/model/member/Member.ts b/model/member/Member.ts new file mode 100644 index 0000000..4ee26a1 --- /dev/null +++ b/model/member/Member.ts @@ -0,0 +1,14 @@ +import {MetaMemberStatus} from '../meta'; + +export interface Member { + id?: number; + email?: string; + pw?: string; + name?: string; + phone?: string; + companyName?: string; + createDate?: Date; + status?: MetaMemberStatus; + signinFailCount?: number; + totpType?: boolean; +} \ No newline at end of file diff --git a/src/model/member/MemberStatus.ts b/model/member/MemberStatus.ts similarity index 100% rename from src/model/member/MemberStatus.ts rename to model/member/MemberStatus.ts diff --git a/model/member/MemberTotp.ts b/model/member/MemberTotp.ts new file mode 100644 index 0000000..29131ac --- /dev/null +++ b/model/member/MemberTotp.ts @@ -0,0 +1,10 @@ +import {Member} from './Member'; + +export interface MemberTotp { + id?: number; + member?: Member; + secretCode?: string; + createDate?: Date; + updateDate?: Date; + otpAuth?: string; +} \ No newline at end of file diff --git a/src/model/member/index.ts b/model/member/index.ts similarity index 100% rename from src/model/member/index.ts rename to model/member/index.ts diff --git a/src/model/meta/crawler/MetaCrawler.ts b/model/meta/MetaCrawler.ts similarity index 83% rename from src/model/meta/crawler/MetaCrawler.ts rename to model/meta/MetaCrawler.ts index 70f5fc4..a2a74c7 100644 --- a/src/model/meta/crawler/MetaCrawler.ts +++ b/model/meta/MetaCrawler.ts @@ -1,10 +1,3 @@ - -// export interface MetaCrawler { -// id: number; -// createDate?: Date; -// name?: string; -// description?: string; -// } export interface MetaCrawler { id?: number; createDate?: Date; diff --git a/model/meta/MetaCrawlerInputItem.ts b/model/meta/MetaCrawlerInputItem.ts new file mode 100644 index 0000000..a948e16 --- /dev/null +++ b/model/meta/MetaCrawlerInputItem.ts @@ -0,0 +1,16 @@ +import {MetaInputType} from './MetaInputType'; +import {MetaCrawler} from './MetaCrawler'; + +export interface MetaCrawlerInputItem { + id?: number; + inputType?: MetaInputType; + crawler?: MetaCrawler; + description?: string; + name?: string; + createDate?: Date; + required?: boolean; + defaultValue?: string; + pattern?: string; + keyName?: string; + keyValue?: string; +} \ No newline at end of file diff --git a/src/model/meta/history-type/MetaHistoryType.ts b/model/meta/MetaHistoryType.ts similarity index 65% rename from src/model/meta/history-type/MetaHistoryType.ts rename to model/meta/MetaHistoryType.ts index 16ff747..4db82f8 100644 --- a/src/model/meta/history-type/MetaHistoryType.ts +++ b/model/meta/MetaHistoryType.ts @@ -1,9 +1,3 @@ -// export interface MetaHistoryType { -// id?: number; -// name?: string; -// createDate?: Date; -// } - export interface MetaHistoryType { id?: number; name?: string; diff --git a/src/model/meta/infra-type/MetaInfraType.ts b/model/meta/MetaInfraType.ts similarity index 69% rename from src/model/meta/infra-type/MetaInfraType.ts rename to model/meta/MetaInfraType.ts index 17fc2e7..05057fa 100644 --- a/src/model/meta/infra-type/MetaInfraType.ts +++ b/model/meta/MetaInfraType.ts @@ -1,9 +1,3 @@ -// export interface MetaInfraType { -// id?: number; -// name?: string; -// createDate?: Date; -// } - export interface MetaInfraType { id?: number; name?: string; diff --git a/src/model/meta/infra-vendor/MetaInfraVendor.ts b/model/meta/MetaInfraVendor.ts similarity index 81% rename from src/model/meta/infra-vendor/MetaInfraVendor.ts rename to model/meta/MetaInfraVendor.ts index dde4b46..44308e0 100644 --- a/src/model/meta/infra-vendor/MetaInfraVendor.ts +++ b/model/meta/MetaInfraVendor.ts @@ -1,12 +1,4 @@ -import { MetaInfraType } from 'model/meta/infra-type/MetaInfraType'; - - -// export interface MetaInfraVendor { -// id?: number; -// name?: string; -// createDate?: Date; -// infraType?: MetaInfraType; -// } +import {MetaInfraType} from './MetaInfraType'; export interface MetaInfraVendor { id?: number; diff --git a/src/model/meta/input-type/MetaInputType.ts b/model/meta/MetaInputType.ts similarity index 65% rename from src/model/meta/input-type/MetaInputType.ts rename to model/meta/MetaInputType.ts index 0a00fc9..5008fc3 100644 --- a/src/model/meta/input-type/MetaInputType.ts +++ b/model/meta/MetaInputType.ts @@ -1,9 +1,3 @@ -// export interface MetaInputType { -// id?: number; -// name: string; -// description: string; -// createDate: Date; -// } export interface MetaInputType { id?: number; diff --git a/src/model/meta/member-status/MetaMemberStatus.ts b/model/meta/MetaMemberStatus.ts similarity index 68% rename from src/model/meta/member-status/MetaMemberStatus.ts rename to model/meta/MetaMemberStatus.ts index 69f5138..1ff7773 100644 --- a/src/model/meta/member-status/MetaMemberStatus.ts +++ b/model/meta/MetaMemberStatus.ts @@ -1,7 +1,3 @@ -// export interface MetaMemberStatus { -// id: number; -// name: string; -// } export interface MetaMemberStatus { id?: number; diff --git a/src/model/meta/noauth-probe-status/MetaNoAuthProbeStatus.ts b/model/meta/MetaNoAuthProbeStatus.ts similarity index 64% rename from src/model/meta/noauth-probe-status/MetaNoAuthProbeStatus.ts rename to model/meta/MetaNoAuthProbeStatus.ts index 4cf7c41..fd91a3f 100644 --- a/src/model/meta/noauth-probe-status/MetaNoAuthProbeStatus.ts +++ b/model/meta/MetaNoAuthProbeStatus.ts @@ -1,9 +1,4 @@ -// export interface MetaNoAuthProbeStatus { -// id?: number; -// name: string; -// } - export interface MetaNoAuthProbeStatus { id?: number; name?: string; diff --git a/model/meta/MetaNotification.ts b/model/meta/MetaNotification.ts new file mode 100644 index 0000000..74fd26c --- /dev/null +++ b/model/meta/MetaNotification.ts @@ -0,0 +1,7 @@ + +export interface MetaNotification { + id?: number; + createDate?: Date; + name?: string; + description?: string; +} \ No newline at end of file diff --git a/src/model/meta/probe-architecture/MetaProbeArchitecture.ts b/model/meta/MetaProbeArchitecture.ts similarity index 58% rename from src/model/meta/probe-architecture/MetaProbeArchitecture.ts rename to model/meta/MetaProbeArchitecture.ts index 27b960c..0bcfdb7 100644 --- a/src/model/meta/probe-architecture/MetaProbeArchitecture.ts +++ b/model/meta/MetaProbeArchitecture.ts @@ -1,10 +1,4 @@ -// export interface MetaProbeArchitecture { -// id?: number; -// architecture: string; -// createDate: Date; -// } - export interface MetaProbeArchitecture { id?: number; architecture?: string; diff --git a/src/model/meta/probe-os/MetaProbeOs.ts b/model/meta/MetaProbeOs.ts similarity index 63% rename from src/model/meta/probe-os/MetaProbeOs.ts rename to model/meta/MetaProbeOs.ts index ac7baff..c196704 100644 --- a/src/model/meta/probe-os/MetaProbeOs.ts +++ b/model/meta/MetaProbeOs.ts @@ -1,10 +1,4 @@ -// export interface MetaProbeOs { -// id?: number; -// name: string; -// createDate: Date; -// } - export interface MetaProbeOs { id?: number; name?: string; diff --git a/model/meta/MetaProbePackage.ts b/model/meta/MetaProbePackage.ts new file mode 100644 index 0000000..3127561 --- /dev/null +++ b/model/meta/MetaProbePackage.ts @@ -0,0 +1,11 @@ +import {MetaProbeVersion} from './MetaProbeVersion'; +import {MetaProbeOs} from './MetaProbeOs'; +import {MetaProbeArchitecture} from './MetaProbeArchitecture'; + +export interface MetaProbePackage { + id?: number; + version?: MetaProbeVersion; + os?: MetaProbeOs; + architecture?: MetaProbeArchitecture; + createDate?: Date; +} \ No newline at end of file diff --git a/src/model/meta/probe-status/MetaProbeStatus.ts b/model/meta/MetaProbeStatus.ts similarity index 62% rename from src/model/meta/probe-status/MetaProbeStatus.ts rename to model/meta/MetaProbeStatus.ts index 017ab2b..fbd2d3b 100644 --- a/src/model/meta/probe-status/MetaProbeStatus.ts +++ b/model/meta/MetaProbeStatus.ts @@ -1,9 +1,4 @@ -// export interface MetaProbeStatus { -// id: number; -// name: string; -// } - export interface MetaProbeStatus { id?: number; name?: string; diff --git a/model/meta/MetaProbeTaskType.ts b/model/meta/MetaProbeTaskType.ts new file mode 100644 index 0000000..41cb201 --- /dev/null +++ b/model/meta/MetaProbeTaskType.ts @@ -0,0 +1,7 @@ + +export interface MetaProbeTaskType { + id?: number; + name?: string; + description?: string; + createDate?: Date; +} diff --git a/model/meta/MetaProbeVersion.ts b/model/meta/MetaProbeVersion.ts new file mode 100644 index 0000000..97aaf9b --- /dev/null +++ b/model/meta/MetaProbeVersion.ts @@ -0,0 +1,6 @@ + +export interface MetaProbeVersion { + id?: number; + version?: string; + createDate?: Date; +} \ No newline at end of file diff --git a/model/meta/MetaSensorDisplayItem.ts b/model/meta/MetaSensorDisplayItem.ts new file mode 100644 index 0000000..2f7fa00 --- /dev/null +++ b/model/meta/MetaSensorDisplayItem.ts @@ -0,0 +1,16 @@ +import {MetaCrawler} from './MetaCrawler'; +import {MetaSensorItemUnit} from './MetaSensorItemUnit'; +import {MetaSensorItemType} from './MetaSensorItemType'; + + +export interface MetaSensorDisplayItem { + id?: number; + key?: string; + displayName?: string; + description?: string; + crawler?: MetaCrawler; + unit?: MetaSensorItemUnit; + createDate?: Date; + itemType?: MetaSensorItemType; + default?: boolean; +} \ No newline at end of file diff --git a/model/meta/MetaSensorDisplayMapping.ts b/model/meta/MetaSensorDisplayMapping.ts new file mode 100644 index 0000000..876919d --- /dev/null +++ b/model/meta/MetaSensorDisplayMapping.ts @@ -0,0 +1,8 @@ +import {MetaSensorDisplayItem} from './MetaSensorDisplayItem'; +import {MetaSensorItemKey} from './MetaSensorItemKey'; + +export interface MetaSensorDisplayMapping { + id?: number; + displayItem?: MetaSensorDisplayItem; + itemKey?: MetaSensorItemKey; +} \ No newline at end of file diff --git a/model/meta/MetaSensorItem.ts b/model/meta/MetaSensorItem.ts new file mode 100644 index 0000000..50275aa --- /dev/null +++ b/model/meta/MetaSensorItem.ts @@ -0,0 +1,7 @@ + +export interface MetaSensorItem { + id?: number; + key?: string; + name?: string; + createDate?: Date; +} \ No newline at end of file diff --git a/model/meta/MetaSensorItemKey.ts b/model/meta/MetaSensorItemKey.ts new file mode 100644 index 0000000..a26a299 --- /dev/null +++ b/model/meta/MetaSensorItemKey.ts @@ -0,0 +1,14 @@ +import {MetaSensorItem} from './MetaSensorItem'; +import {MetaCrawler} from './MetaCrawler'; +import {MetaSensorItemUnit} from './MetaSensorItemUnit'; + +export interface MetaSensorItemKey { + id?: number; + item?: MetaSensorItem; + key?: string; + froms?: string; + option?: string; + crawler?: MetaCrawler; + createDate?: Date; + unit?: MetaSensorItemUnit; +} \ No newline at end of file diff --git a/model/meta/MetaSensorItemType.ts b/model/meta/MetaSensorItemType.ts new file mode 100644 index 0000000..144ddfc --- /dev/null +++ b/model/meta/MetaSensorItemType.ts @@ -0,0 +1,7 @@ + +export interface MetaSensorItemType { + id?: number; + name?: string; + description?: string; + createDate?: Date; +} \ No newline at end of file diff --git a/model/meta/MetaSensorItemUnit.ts b/model/meta/MetaSensorItemUnit.ts new file mode 100644 index 0000000..dc7e663 --- /dev/null +++ b/model/meta/MetaSensorItemUnit.ts @@ -0,0 +1,7 @@ + +export interface MetaSensorItemUnit { + id?: number; + unit?: string; + createDate?: Date; + mark?: string; +} \ No newline at end of file diff --git a/src/model/meta/sensor-status/MetaSensorStatus.ts b/model/meta/MetaSensorStatus.ts similarity index 62% rename from src/model/meta/sensor-status/MetaSensorStatus.ts rename to model/meta/MetaSensorStatus.ts index e642c95..be82dac 100644 --- a/src/model/meta/sensor-status/MetaSensorStatus.ts +++ b/model/meta/MetaSensorStatus.ts @@ -1,9 +1,4 @@ -// export interface MetaSensorStatus { -// id?: number; -// name?: string; -// } - export interface MetaSensorStatus { id?: number; name?: string; diff --git a/model/meta/MetaVendorCrawler.ts b/model/meta/MetaVendorCrawler.ts new file mode 100644 index 0000000..68e3d71 --- /dev/null +++ b/model/meta/MetaVendorCrawler.ts @@ -0,0 +1,9 @@ +import {MetaCrawler} from './MetaCrawler'; +import {MetaInfraVendor} from './MetaInfraVendor'; + +export interface MetaVendorCrawler { + id?: number; + crawler: MetaCrawler; + infraVendor: MetaInfraVendor; + createDate: Date; +} diff --git a/src/model/meta/model-temp/MetaVendorCrawlerSensorItem.ts b/model/meta/MetaVendorCrawlerSensorItem.ts similarity index 58% rename from src/model/meta/model-temp/MetaVendorCrawlerSensorItem.ts rename to model/meta/MetaVendorCrawlerSensorItem.ts index ddad80c..6175ed8 100644 --- a/src/model/meta/model-temp/MetaVendorCrawlerSensorItem.ts +++ b/model/meta/MetaVendorCrawlerSensorItem.ts @@ -1,6 +1,5 @@ -import { MetaSensorItem } from 'model/meta/sensor-item/MetaSensorItem'; -import { MetaInfraVendor } from 'model/meta/infra-vendor/MetaInfraVendor'; - +import {MetaSensorItem} from './MetaSensorItem'; +import {MetaInfraVendor} from './MetaInfraVendor'; export interface MetaVendorCrawlerSensorItem { id?: number; diff --git a/model/meta/index.ts b/model/meta/index.ts new file mode 100644 index 0000000..bb86844 --- /dev/null +++ b/model/meta/index.ts @@ -0,0 +1,25 @@ +export * from './MetaCrawler'; +export * from './MetaCrawlerInputItem'; +export * from './MetaHistoryType'; +export * from './MetaInfraType'; +export * from './MetaInfraVendor'; +export * from './MetaInputType'; +export * from './MetaMemberStatus'; +export * from './MetaNoAuthProbeStatus'; +export * from './MetaNotification'; +export * from './MetaProbeArchitecture'; +export * from './MetaProbeOs'; +export * from './MetaProbePackage'; +export * from './MetaProbeStatus'; +export * from './MetaProbeTaskType'; +export * from './MetaProbeVersion'; +export * from './MetaSensorDisplayItem'; +export * from './MetaSensorDisplayMapping'; +export * from './MetaSensorItem'; +export * from './MetaSensorItemKey'; +export * from './MetaSensorItemType'; +export * from './MetaSensorItemUnit'; +export * from './MetaSensorStatus'; +export * from './MetaVendorCrawler'; +export * from './MetaVendorCrawlerSensorItem'; + diff --git a/model/noauth/NoAuthProbe.ts b/model/noauth/NoAuthProbe.ts new file mode 100644 index 0000000..26120b7 --- /dev/null +++ b/model/noauth/NoAuthProbe.ts @@ -0,0 +1,14 @@ +import {MetaNoAuthProbeStatus} from '../meta'; +import {Domain} from '../domain'; +import {Probe} from '../probe'; + +export interface NoAuthProbe { + id?: number; + description?: string; + status?: MetaNoAuthProbeStatus; + tempProbeKey?: string; + createDate?: Date; + apiKey?: string; + domain?: Domain; + probe?: Probe; +} \ No newline at end of file diff --git a/src/model/noauth/index.ts b/model/noauth/index.ts similarity index 100% rename from src/model/noauth/index.ts rename to model/noauth/index.ts diff --git a/model/notification/Notification.ts b/model/notification/Notification.ts new file mode 100644 index 0000000..0ea5eca --- /dev/null +++ b/model/notification/Notification.ts @@ -0,0 +1,11 @@ +import {Member} from '../member'; + +export interface Notification { + id?: number; + createDate?: Date; + title?: string; + message?: string; + member?: Member; + confirmDate?: Date; + url?: string; +} diff --git a/src/model/notification/index.ts b/model/notification/index.ts similarity index 100% rename from src/model/notification/index.ts rename to model/notification/index.ts diff --git a/model/probe/Probe.ts b/model/probe/Probe.ts new file mode 100644 index 0000000..d3883de --- /dev/null +++ b/model/probe/Probe.ts @@ -0,0 +1,17 @@ +import {MetaProbeStatus} from '../meta'; +import {Domain} from '../domain'; +import {Member} from '../member'; + +export interface Probe { + id?: number; + status?: MetaProbeStatus; + description?: string; + createDate?: Date; + domain?: Domain; + probeKey?: string; + encryptionKey?: string; + displayName?: string; + cidr?: string; + authorizeDate?: Date; + authorizeMember?: Member; +} \ No newline at end of file diff --git a/model/probe/ProbeHost.ts b/model/probe/ProbeHost.ts new file mode 100644 index 0000000..0f345db --- /dev/null +++ b/model/probe/ProbeHost.ts @@ -0,0 +1,8 @@ +import { Probe } from './Probe'; +import {InfraHost} from '../infra'; + +export interface ProbeHost { + id?: number; + probe?: Probe; + host?: InfraHost; +} \ No newline at end of file diff --git a/model/probe/ProbeTask.ts b/model/probe/ProbeTask.ts new file mode 100644 index 0000000..77002d9 --- /dev/null +++ b/model/probe/ProbeTask.ts @@ -0,0 +1,14 @@ +import { Probe } from './Probe'; +import {MetaProbeTaskType} from '../meta'; + +export interface ProbeTask { + id?: number; + taskType?: MetaProbeTaskType; + probe?: Probe; + data?: string; + createDate?: Date; + sendDate?: Date; + startDate?: Date; + endDate?: Date; + succeed?: boolean; +} \ No newline at end of file diff --git a/src/model/probe/index.ts b/model/probe/index.ts similarity index 100% rename from src/model/probe/index.ts rename to model/probe/index.ts diff --git a/model/sensor-item/SensorItem.ts b/model/sensor-item/SensorItem.ts new file mode 100644 index 0000000..cd26698 --- /dev/null +++ b/model/sensor-item/SensorItem.ts @@ -0,0 +1,9 @@ +import {Sensor} from '../sensor'; +import {MetaSensorDisplayItem} from '../meta'; + +export interface SensorItem { + id?: number; + sensor?: Sensor; + item?: MetaSensorDisplayItem; + createDate?: Date; +} diff --git a/model/sensor-item/SensorItemDependency.ts b/model/sensor-item/SensorItemDependency.ts new file mode 100644 index 0000000..1cf5c45 --- /dev/null +++ b/model/sensor-item/SensorItemDependency.ts @@ -0,0 +1,7 @@ +import {MetaSensorDisplayItem, MetaSensorItemKey} from '../meta'; + +export interface SensorItemDependency { + id?: number; + displayItem?: MetaSensorDisplayItem; + sensorItem?: MetaSensorItemKey; +} diff --git a/model/sensor/Sensor.ts b/model/sensor/Sensor.ts new file mode 100644 index 0000000..1e3f5a7 --- /dev/null +++ b/model/sensor/Sensor.ts @@ -0,0 +1,13 @@ +import {MetaCrawler, MetaSensorStatus} from '../meta'; +import {Target} from '../target'; + +export interface Sensor { + id?: number; + createDate?: Date; + description?: string; + status?: MetaSensorStatus; + target?: Target; + crawler?: MetaCrawler; + crawlerInputItems?: string; + itemCount?: number; +} \ No newline at end of file diff --git a/src/model/sensor/SensorRegistInfo.ts b/model/sensor/SensorRegistInfo.ts similarity index 53% rename from src/model/sensor/SensorRegistInfo.ts rename to model/sensor/SensorRegistInfo.ts index 661e289..96c585a 100644 --- a/src/model/sensor/SensorRegistInfo.ts +++ b/model/sensor/SensorRegistInfo.ts @@ -1,7 +1,5 @@ - -import { Infra } from 'model/infra'; -import { MetaCrawler } from 'model/meta/crawler/MetaCrawler'; -import { MetaSensorDisplayItem } from 'model/meta/sensor-display-item/MetaSensorDisplayItem'; +import {MetaCrawler, MetaSensorDisplayItem} from '../meta'; +import {Infra} from '../infra'; export interface SensorRegistInfo { sensorItemMap: Map>; diff --git a/src/model/sensor/index.ts b/model/sensor/index.ts similarity index 100% rename from src/model/sensor/index.ts rename to model/sensor/index.ts diff --git a/model/target/Target.ts b/model/target/Target.ts new file mode 100644 index 0000000..75b82fa --- /dev/null +++ b/model/target/Target.ts @@ -0,0 +1,9 @@ +import {Sensor} from '../sensor'; + +export interface Target { + id?: number; + createDate?: Date; + displayName?: string; + description?: string; + sensors?: Sensor[]; +} \ No newline at end of file diff --git a/src/model/target/index.ts b/model/target/index.ts similarity index 100% rename from src/model/target/index.ts rename to model/target/index.ts diff --git a/src/model/discovery/CryptoType.ts b/src/model/discovery/CryptoType.ts deleted file mode 100644 index 5061e16..0000000 --- a/src/model/discovery/CryptoType.ts +++ /dev/null @@ -1,3 +0,0 @@ - - -export type CryptoType = "TLS"; \ No newline at end of file diff --git a/src/model/discovery/PortType.ts b/src/model/discovery/PortType.ts deleted file mode 100644 index 6b864bf..0000000 --- a/src/model/discovery/PortType.ts +++ /dev/null @@ -1,8 +0,0 @@ - -// enum PortType { -// TCP = 1, -// UDP = 2, -// TLS = 3, -// } - -export type PortType = 'TCP' | 'UDP' | 'TLS'; diff --git a/src/model/history/History.ts b/src/model/history/History.ts deleted file mode 100644 index 951c8a5..0000000 --- a/src/model/history/History.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { MetaHistoryType } from "model/meta/history-type/MetaHistoryType"; -import { Probe } from "model/probe"; -import { Member } from "model/member"; -import { Domain } from "model/domain"; - -export interface History { - id?: number; - createDate?: Date; - type?: MetaHistoryType; - message?: string; - probe?: Probe; - member?: Member; - domain?: Domain; -} diff --git a/src/model/infra/Infra.ts b/src/model/infra/Infra.ts deleted file mode 100644 index 8baece2..0000000 --- a/src/model/infra/Infra.ts +++ /dev/null @@ -1,21 +0,0 @@ - -import { Probe } from 'model/probe'; -import { Target } from 'model/target'; -import { MetaInfraType } from 'model/meta/infra-type/MetaInfraType'; - -// export interface Infra { -// id?: number; -// infraType?: MetaInfraType; -// childId?: number; -// createDate?: Date; -// probe?: Probe; -// target?: Target; -// } - -export interface Infra { - id?: number; - infraType?: MetaInfraType; - createDate?: Date; - probe?: Probe; - target?: Target; -} \ No newline at end of file diff --git a/src/model/infra/InfraMachine.ts b/src/model/infra/InfraMachine.ts deleted file mode 100644 index 24eb601..0000000 --- a/src/model/infra/InfraMachine.ts +++ /dev/null @@ -1,12 +0,0 @@ - -import { Infra } from './Infra'; - -// export interface InfraMachine extends Infra { -// // id?: number; -// meta?: string; -// createDate?: Date; -// } - -export interface InfraMachine extends Infra { - meta?: string; -} diff --git a/src/model/infra/InfraOS.ts b/src/model/infra/InfraOS.ts deleted file mode 100644 index aec5f38..0000000 --- a/src/model/infra/InfraOS.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { InfraMachine } from './InfraMachine'; -import { Infra } from './Infra'; -import { MetaInfraVendor } from 'model/meta/infra-vendor/MetaInfraVendor'; - -// export interface InfraOS extends Infra { -// // id?: number; -// machine?: InfraMachine; -// meta?: string; -// createDate?: Date; -// vendor?: MetaInfraVendor; -// } - - -export interface InfraOS extends Infra { - machine?: InfraMachine; - meta?: string; - vendor?: MetaInfraVendor; -} \ No newline at end of file diff --git a/src/model/infra/InfraOSPort.ts b/src/model/infra/InfraOSPort.ts deleted file mode 100644 index 019d4c9..0000000 --- a/src/model/infra/InfraOSPort.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { InfraOS } from './InfraOS'; -import { Infra } from './Infra'; -import { MetaInfraVendor } from 'model/meta/infra-vendor/MetaInfraVendor'; - -// export interface InfraOSPort extends Infra { -// // id?: number; -// os?: InfraOS; -// createDate?: Date; -// port?: number; -// portType?: string; -// vendor?: MetaInfraVendor; -// tlsType?: boolean; -// } - -export interface InfraOSPort extends Infra { - os?: InfraOS; - port?: number; - portType?: string; - vendor?: MetaInfraVendor; - tlsType?: boolean; -} \ No newline at end of file diff --git a/src/model/infra/InfraService.ts b/src/model/infra/InfraService.ts deleted file mode 100644 index ba13c2e..0000000 --- a/src/model/infra/InfraService.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { InfraHost } from './InfraHost'; -import { Infra } from './Infra'; -import { MetaInfraVendor } from 'model/meta/infra-vendor/MetaInfraVendor'; - -// export interface InfraService extends Infra { -// // id?: number; -// host?: InfraHost; -// portType?: string; -// port?: number; -// vendor?: MetaInfraVendor; -// createDate?: Date; -// tlsType?: boolean; -// } - -export interface InfraService extends Infra { - host?: InfraHost; - portType?: string; - port?: number; - vendor?: MetaInfraVendor; - tlsType?: boolean; -} \ No newline at end of file diff --git a/src/model/member/Member.ts b/src/model/member/Member.ts deleted file mode 100644 index 195c37a..0000000 --- a/src/model/member/Member.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { MetaMemberStatus } from 'model/meta/member-status/MetaMemberStatus'; - -// export interface Member { -// id?: number; -// email?: string; -// password?: string; -// name?: string; -// phone?: string; -// companyName?: string; -// createDate?: Date; -// totpType?: boolean; -// status?: MetaMemberStatus; -// } - -export interface Member { - id?: number; - email?: string; - pw?: string; - name?: string; - phone?: string; - companyName?: string; - createDate?: Date; - status?: MetaMemberStatus; - signinFailCount?: number; - totpType?: boolean; -} \ No newline at end of file diff --git a/src/model/member/MemberTotp.ts b/src/model/member/MemberTotp.ts deleted file mode 100644 index e49b6ab..0000000 --- a/src/model/member/MemberTotp.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Member } from 'model/member'; - -// export interface MemberTotp { -// id?: number; -// member: Member; -// secretCode?: string; -// createDate?: Date; -// updateDate?: Date; -// otpAuthUrl?: string; -// } - - -export interface MemberTotp { - id?: number; - member?: Member; - secretCode?: string; - createDate?: Date; - updateDate?: Date; - otpAuth?: string; -} \ No newline at end of file diff --git a/src/model/meta/crawler-input-item/MetaCrawlerInputItem.ts b/src/model/meta/crawler-input-item/MetaCrawlerInputItem.ts deleted file mode 100644 index 2ea5150..0000000 --- a/src/model/meta/crawler-input-item/MetaCrawlerInputItem.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { MetaInputType } from 'model/meta/input-type/MetaInputType'; -import { MetaCrawler } from 'model/meta/crawler/MetaCrawler'; - - -// export interface MetaCrawlerInputItem { -// id?: number; -// inputType?: MetaInputType; -// crawler?: MetaCrawler; -// description?: string; -// name?: string; -// createDate?: Date; -// required?: boolean; -// defaultValue?: string; -// pattern?: string; -// keyName?: string; -// keyValue?: string; -// } - -export interface MetaCrawlerInputItem { - id?: number; - inputType?: MetaInputType; - crawler?: MetaCrawler; - description?: string; - name?: string; - createDate?: Date; - required?: boolean; - defaultValue?: string; - pattern?: string; - keyName?: string; - keyValue?: string; -} \ No newline at end of file diff --git a/src/model/meta/model-temp/MetaVendorCrawler.ts b/src/model/meta/model-temp/MetaVendorCrawler.ts deleted file mode 100644 index 2cd9e22..0000000 --- a/src/model/meta/model-temp/MetaVendorCrawler.ts +++ /dev/null @@ -1,10 +0,0 @@ - -import { MetaCrawler } from 'model/meta/crawler/MetaCrawler'; -import { MetaInfraVendor } from 'model/meta/infra-vendor/MetaInfraVendor'; - -export interface MetaVendorCrawler { - id?: number; - crawler: MetaCrawler; - infraVendor: MetaInfraVendor; - createDate: Date; -} diff --git a/src/model/meta/model-temp/index.ts b/src/model/meta/model-temp/index.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/model/meta/notification/MetaNotification.ts b/src/model/meta/notification/MetaNotification.ts deleted file mode 100644 index 10cb790..0000000 --- a/src/model/meta/notification/MetaNotification.ts +++ /dev/null @@ -1,16 +0,0 @@ - -// export interface MetaNotification { -// id?: number; -// createDate: Date; -// name: string; -// description: string; -// } - - - -export interface MetaNotification { - id?: number; - createDate?: Date; - name?: string; - description?: string; -} \ No newline at end of file diff --git a/src/model/meta/probe-package/MetaProbePackage.ts b/src/model/meta/probe-package/MetaProbePackage.ts deleted file mode 100644 index 2b88ddd..0000000 --- a/src/model/meta/probe-package/MetaProbePackage.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { MetaProbeVersion } from 'model/meta/probe-version/MetaProbeVersion'; -import { MetaProbeOs } from 'model/meta/probe-os/MetaProbeOs'; -import { MetaProbeArchitecture } from 'model/meta/probe-architecture/MetaProbeArchitecture'; - -// export interface MetaProbePackage { -// id?: number; -// version: MetaProbeVersion; -// os: MetaProbeOs; -// architecture: MetaProbeArchitecture; -// createDate: Date; -// } - - -export interface MetaProbePackage { - id?: number; - version?: MetaProbeVersion; - os?: MetaProbeOs; - architecture?: MetaProbeArchitecture; - createDate?: Date; -} \ No newline at end of file diff --git a/src/model/meta/probe-task-type/MetaProbeTaskType.ts b/src/model/meta/probe-task-type/MetaProbeTaskType.ts deleted file mode 100644 index a46caf5..0000000 --- a/src/model/meta/probe-task-type/MetaProbeTaskType.ts +++ /dev/null @@ -1,15 +0,0 @@ - -// export interface MetaProbeTaskType { -// id?: number; -// name: string; -// description: string; -// createDate: Date; -// } - - -export interface MetaProbeTaskType { - id?: number; - name?: string; - description?: string; - createDate?: Date; -} diff --git a/src/model/meta/probe-version/MetaProbeVersion.ts b/src/model/meta/probe-version/MetaProbeVersion.ts deleted file mode 100644 index 9cc9142..0000000 --- a/src/model/meta/probe-version/MetaProbeVersion.ts +++ /dev/null @@ -1,12 +0,0 @@ -// export interface MetaProbeVersion { -// id?: number; -// version: string; -// createDate: Date; -// } - - -export interface MetaProbeVersion { - id?: number; - version?: string; - createDate?: Date; -} \ No newline at end of file diff --git a/src/model/meta/sensor-display-item/MetaSensorDisplayItem.ts b/src/model/meta/sensor-display-item/MetaSensorDisplayItem.ts deleted file mode 100644 index 8809a68..0000000 --- a/src/model/meta/sensor-display-item/MetaSensorDisplayItem.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { MetaCrawler } from 'model/meta/crawler/MetaCrawler'; -import { MetaSensorItemUnit } from 'model/meta/sensor-item-unit/MetaSensorItemUnit'; -import { MetaSensorItemType } from 'model/meta/sensor-item-type/MetaSensorItemType'; - -// export interface MetaSensorDisplayItem { -// id?: number; -// key?: string; -// displayName?: string; -// description?: string; -// crawler?: MetaCrawler; -// unit?: MetaSensorItemUnit; -// createDate?: Date; -// default?: boolean; -// itemType?: MetaSensorItemType; -// } - - -export interface MetaSensorDisplayItem { - id?: number; - key?: string; - displayName?: string; - description?: string; - crawler?: MetaCrawler; - unit?: MetaSensorItemUnit; - createDate?: Date; - itemType?: MetaSensorItemType; - default?: boolean; -} \ No newline at end of file diff --git a/src/model/meta/sensor-display-mapping/MetaSensorDisplayMapping.ts b/src/model/meta/sensor-display-mapping/MetaSensorDisplayMapping.ts deleted file mode 100644 index 4b3a934..0000000 --- a/src/model/meta/sensor-display-mapping/MetaSensorDisplayMapping.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { MetaSensorDisplayItem } from "model/meta/sensor-display-item/MetaSensorDisplayItem"; -import { MetaSensorItemKey } from "model/meta/sensor-item-key/MetaSensorItemKey"; - -export interface MetaSensorDisplayMapping { - id?: number; - displayItem?: MetaSensorDisplayItem; - itemKey?: MetaSensorItemKey; -} \ No newline at end of file diff --git a/src/model/meta/sensor-item-key/MetaSensorItemKey.ts b/src/model/meta/sensor-item-key/MetaSensorItemKey.ts deleted file mode 100644 index 459b4e4..0000000 --- a/src/model/meta/sensor-item-key/MetaSensorItemKey.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { MetaSensorItem } from 'model/meta/sensor-item/MetaSensorItem'; -import { MetaCrawler } from 'model/meta/crawler/MetaCrawler'; -import { MetaSensorItemUnit } from 'model/meta/sensor-item-unit/MetaSensorItemUnit'; - -// export interface MetaSensorItemKey { -// id: number; -// item: MetaSensorItem; -// key: string; -// froms: string; -// option: string; -// crawler: MetaCrawler; -// createDate: Date; -// } - -export interface MetaSensorItemKey { - id?: number; - item?: MetaSensorItem; - key?: string; - froms?: string; - option?: string; - crawler?: MetaCrawler; - createDate?: Date; - unit?: MetaSensorItemUnit; -} \ No newline at end of file diff --git a/src/model/meta/sensor-item-type/MetaSensorItemType.ts b/src/model/meta/sensor-item-type/MetaSensorItemType.ts deleted file mode 100644 index 597e186..0000000 --- a/src/model/meta/sensor-item-type/MetaSensorItemType.ts +++ /dev/null @@ -1,14 +0,0 @@ -// export interface MetaSensorItemType { -// id?: number; -// name?: string; -// description?: string; -// createDate?: Date; -// } - - -export interface MetaSensorItemType { - id?: number; - name?: string; - description?: string; - createDate?: Date; -} \ No newline at end of file diff --git a/src/model/meta/sensor-item-unit/MetaSensorItemUnit.ts b/src/model/meta/sensor-item-unit/MetaSensorItemUnit.ts deleted file mode 100644 index d5e7c34..0000000 --- a/src/model/meta/sensor-item-unit/MetaSensorItemUnit.ts +++ /dev/null @@ -1,14 +0,0 @@ -// export interface MetaSensorItemUnit { -// id: number; -// unit: string; -// createDate: Date; -// mark: string; -// } - - -export interface MetaSensorItemUnit { - id?: number; - unit?: string; - createDate?: Date; - mark?: string; -} \ No newline at end of file diff --git a/src/model/meta/sensor-item/MetaSensorItem.ts b/src/model/meta/sensor-item/MetaSensorItem.ts deleted file mode 100644 index 1e995f9..0000000 --- a/src/model/meta/sensor-item/MetaSensorItem.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { MetaSensorItemType } from 'model/meta/sensor-item-type/MetaSensorItemType'; - - -// export interface MetaSensorItem { -// id?: number; -// itemType?: MetaSensorItemType; -// key?: string; -// name?: string; -// createDate?: Date; -// } - -export interface MetaSensorItem { - id?: number; - key?: string; - name?: string; - createDate?: Date; -} \ No newline at end of file diff --git a/src/model/meta/vendor-crawler-sensor-item/MetaVendorCrawlerSensorItem.ts b/src/model/meta/vendor-crawler-sensor-item/MetaVendorCrawlerSensorItem.ts deleted file mode 100644 index 5399afb..0000000 --- a/src/model/meta/vendor-crawler-sensor-item/MetaVendorCrawlerSensorItem.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { MetaSensorItem } from "../sensor-item/MetaSensorItem"; -import { MetaInfraVendor } from "../infra-vendor/MetaInfraVendor"; - -export interface MetaVendorCrawlerSensorItem { - id?: number; - interval?: string; - warnCondition?: string; - createDate?: Date; - sensorItem?: MetaSensorItem; - vendor?: MetaInfraVendor; - crawlerId?: number; -} \ No newline at end of file diff --git a/src/model/meta/vendor-crawler/MetaVendorCrawler.ts b/src/model/meta/vendor-crawler/MetaVendorCrawler.ts deleted file mode 100644 index d1cbc9a..0000000 --- a/src/model/meta/vendor-crawler/MetaVendorCrawler.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { MetaCrawler } from "../crawler/MetaCrawler"; -import { MetaInfraVendor } from "../infra-vendor/MetaInfraVendor"; - - -export interface MetaVendorCrawler { - id?: number; - crawler?: MetaCrawler; - infraVendor?: MetaInfraVendor; - createDate?: Date; -} \ No newline at end of file diff --git a/src/model/noauth/NoAuthProbe.ts b/src/model/noauth/NoAuthProbe.ts deleted file mode 100644 index d8adb1b..0000000 --- a/src/model/noauth/NoAuthProbe.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { Probe } from 'model/probe'; -import { Domain } from 'model/domain'; -import { MetaNoAuthProbeStatus } from 'model/meta/noauth-probe-status/MetaNoAuthProbeStatus'; - -// export interface NoAuthProbe { -// // id?: number; -// // hostName?: string; -// // macAddress?: number; -// // ipAddress?: number; -// // status?: MetaNoAuthProbeStatus; -// // tempProbeKey?: string; -// // createDate?: Date; -// // apiKey?: string; -// // domain?: Domain; -// // probe?: Probe; -// id?: number; -// description?: string; -// status?: MetaNoAuthProbeStatus; -// tempProbeKey?: string; -// createDate?: Date; -// apiKey?: string; -// domain?: Domain; -// probe?: Probe; -// } - - -export interface NoAuthProbe { - id?: number; - description?: string; - status?: MetaNoAuthProbeStatus; - tempProbeKey?: string; - createDate?: Date; - apiKey?: string; - domain?: Domain; - probe?: Probe; -} \ No newline at end of file diff --git a/src/model/notification/Notification.ts b/src/model/notification/Notification.ts deleted file mode 100644 index c4c64ce..0000000 --- a/src/model/notification/Notification.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Member } from 'model/member'; - - -// export interface Notification { -// id?: number; -// createDate?: Date; -// title?: string; -// message?: string; -// member?: Member; -// confirmDate?: Date; -// url?: string; -// } - - -export interface Notification { - id?: number; - createDate?: Date; - title?: string; - message?: string; - member?: Member; - confirmDate?: Date; - url?: string; -} diff --git a/src/model/probe/Probe.ts b/src/model/probe/Probe.ts deleted file mode 100644 index 7e6267a..0000000 --- a/src/model/probe/Probe.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Domain } from 'model/domain/'; -import { Member } from 'model/member/'; -import { Infra } from 'model/infra/'; -import { MetaProbeStatus } from 'model/meta/probe-status/MetaProbeStatus'; - -// export interface Probe { -// id?: number; -// status?: MetaProbeStatus; // INITIAL / NORMAL -// description?: string; -// createDate?: Date; -// domain?: Domain; -// probeKey?: string; -// encryptionKey?: string; -// displayName?: string; -// cidr?: string; -// authorizeDate?: Date; -// authorizeMember?: Member; -// // host?: InfraHost; -// targets?: Infra[]; -// } - - -export interface Probe { - id?: number; - status?: MetaProbeStatus; - description?: string; - createDate?: Date; - domain?: Domain; - probeKey?: string; - encryptionKey?: string; - displayName?: string; - cidr?: string; - authorizeDate?: Date; - authorizeMember?: Member; -} \ No newline at end of file diff --git a/src/model/probe/ProbeHost.ts b/src/model/probe/ProbeHost.ts deleted file mode 100644 index e0eb05f..0000000 --- a/src/model/probe/ProbeHost.ts +++ /dev/null @@ -1,15 +0,0 @@ - -import { Probe } from './Probe'; -import { InfraHost } from 'model/infra'; - -// export interface ProbeHost { -// id?: number; -// probe?: Probe; -// host?: InfraHost; -// } - -export interface ProbeHost { - id?: number; - probe?: Probe; - host?: InfraHost; -} \ No newline at end of file diff --git a/src/model/probe/ProbeTask.ts b/src/model/probe/ProbeTask.ts deleted file mode 100644 index f90d74a..0000000 --- a/src/model/probe/ProbeTask.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { Probe } from './Probe'; -import { MetaProbeTaskType } from 'model/meta/probe-task-type/MetaProbeTaskType'; - -// export interface ProbeTask { -// id?: number; -// taskType: MetaProbeTaskType; -// probe: Probe; -// data: string; -// createDate: Date; -// sendDate: Date; -// startDate: Date; -// endDate: Date; -// succeed: boolean; -// } - -export interface ProbeTask { - id?: number; - taskType?: MetaProbeTaskType; - probe?: Probe; - data?: string; - createDate?: Date; - sendDate?: Date; - startDate?: Date; - endDate?: Date; - succeed?: boolean; -} \ No newline at end of file diff --git a/src/model/sensor-item/SensorItem.ts b/src/model/sensor-item/SensorItem.ts deleted file mode 100644 index aba6c02..0000000 --- a/src/model/sensor-item/SensorItem.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { MetaSensorDisplayItem } from 'model/meta/sensor-display-item/MetaSensorDisplayItem'; -import { Sensor } from 'model/sensor'; - -// export interface SensorItem { -// id?: number; -// sensor?: Sensor; -// item?: MetaSensorDisplayItem; -// createDate?: Date; -// } - - -export interface SensorItem { - id?: number; - sensor?: Sensor; - item?: MetaSensorDisplayItem; - createDate?: Date; -} diff --git a/src/model/sensor-item/SensorItemDependency.ts b/src/model/sensor-item/SensorItemDependency.ts deleted file mode 100644 index e11c282..0000000 --- a/src/model/sensor-item/SensorItemDependency.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { MetaSensorDisplayItem } from 'model/meta/sensor-display-item/MetaSensorDisplayItem'; -import { MetaSensorItemKey } from 'model/meta/sensor-item-key/MetaSensorItemKey'; - -// export interface SensorItemDependency { -// id?: number; -// item?: MetaSensorDisplayItem; -// sensorItem?: MetaSensorItemKey; -// } - -export interface SensorItemDependency { - id?: number; - displayItem?: MetaSensorDisplayItem; - sensorItem?: MetaSensorItemKey; -} diff --git a/src/model/sensor/Sensor.ts b/src/model/sensor/Sensor.ts deleted file mode 100644 index 851a626..0000000 --- a/src/model/sensor/Sensor.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Target } from 'model/target'; -import { MetaSensorStatus } from 'model/meta/sensor-status/MetaSensorStatus'; -import { MetaCrawler } from 'model/meta/crawler/MetaCrawler'; - -// export interface Sensor { -// id?: number; -// createDate?: Date; -// description?: string; -// status?: MetaSensorStatus; -// target?: Target; -// crawler?: MetaCrawler; -// crawlerInputItems?: string; -// itemCount?: number; -// } - -export interface Sensor { - id?: number; - createDate?: Date; - description?: string; - status?: MetaSensorStatus; - target?: Target; - crawler?: MetaCrawler; - crawlerInputItems?: string; - itemCount?: number; -} \ No newline at end of file diff --git a/src/model/target/Target.ts b/src/model/target/Target.ts deleted file mode 100644 index 6bc6dd2..0000000 --- a/src/model/target/Target.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Probe } from 'model/probe'; -import { Infra } from 'model/infra'; -import { Sensor } from 'model/sensor'; - -// export interface Target { -// id?: number; -// createDate?: Date; -// displayName?: string; -// description?: string; -// sensors?: Sensor[]; -// } - - -export interface Target { - id?: number; - createDate?: Date; - displayName?: string; - description?: string; - sensors?: Sensor[]; -} \ No newline at end of file