From 7512d74474ffb600d29c80692a49a1a56d2a0ffd Mon Sep 17 00:00:00 2001 From: crusader Date: Thu, 7 Jun 2018 15:42:32 +0900 Subject: [PATCH] ing --- .editorconfig | 13 ++++++++++++ .vscode/settings.json | 6 ++++++ src/core/index.ts | 2 ++ src/{model/commons => core/model}/Page.ts | 0 src/core/model/PageParams.ts | 6 ++++++ src/core/model/index.ts | 2 ++ .../discovery => core/type}/CryptoType.ts | 0 .../discovery => core/type}/PortType.ts | 0 src/core/type/index.ts | 2 ++ src/index.ts | 2 ++ src/model/alert/Alert.ts | 4 ++-- src/model/alert/AlertMetric.ts | 6 +++--- src/model/alert/AlertSystem.ts | 6 +++--- src/model/apikey/ApiKey.ts | 10 +++++----- src/model/apikey/index.ts | 1 + src/model/auth/AuthCrawler.ts | 10 +++++----- src/model/auth/index.ts | 1 + src/model/commons/PageParams.ts | 6 ------ src/model/discovery/DiscoverHost.ts | 1 - src/model/discovery/DiscoverZone.ts | 2 +- src/model/discovery/DiscoveryStartInfo.ts | 11 ---------- src/model/discovery/Host.ts | 20 +++++++++---------- src/model/discovery/Port.ts | 18 ++++++++--------- src/model/discovery/Service.ts | 14 ++++++------- src/model/discovery/index.ts | 4 +--- src/model/domain/Domain.ts | 2 +- src/model/domain/DomainMember.ts | 2 +- src/model/email/EmailAuth.ts | 14 ++++++------- src/model/email/index.ts | 1 + src/model/history/History.ts | 14 ++++++------- src/model/history/index.ts | 1 + src/model/index.ts | 16 +++++++++++++++ src/model/infra/Infra.ts | 10 +++++----- src/model/infra/InfraHost.ts | 8 ++++---- src/model/infra/InfraMachine.ts | 3 +-- src/model/infra/InfraOS.ts | 6 +++--- src/model/infra/InfraOSApplication.ts | 4 ++-- src/model/infra/InfraOSDaemon.ts | 4 ++-- src/model/infra/InfraOSPort.ts | 10 +++++----- src/model/infra/InfraService.ts | 10 +++++----- src/model/infra/index.ts | 4 ++-- src/model/member/Member.ts | 2 +- src/model/member/MemberStatus.ts | 6 ------ src/model/member/MemberTotp.ts | 4 ++-- src/model/member/index.ts | 2 +- src/model/meta/MetaCrawler.ts | 2 +- src/model/meta/MetaCrawlerInputItem.ts | 2 +- src/model/meta/MetaHistoryType.ts | 2 +- src/model/meta/MetaInfraType.ts | 2 +- src/model/meta/MetaMemberStatus.ts | 2 +- src/model/meta/MetaNoAuthProbeStatus.ts | 2 +- src/model/meta/MetaNotification.ts | 2 +- src/model/meta/MetaProbeArchitecture.ts | 3 +-- src/model/meta/MetaProbeOs.ts | 2 +- src/model/meta/MetaProbePackage.ts | 2 +- src/model/meta/MetaProbeStatus.ts | 2 +- src/model/meta/MetaProbeVersion.ts | 2 +- src/model/meta/MetaSensorDisplayItem.ts | 20 +++++++++---------- src/model/meta/MetaSensorDisplayMapping.ts | 8 ++++---- src/model/meta/MetaSensorItem.ts | 2 +- src/model/meta/MetaSensorItemKey.ts | 2 +- src/model/meta/MetaSensorItemType.ts | 2 +- src/model/meta/MetaSensorItemUnit.ts | 2 +- src/model/meta/MetaSensorStatus.ts | 2 +- src/model/meta/index.ts | 1 - src/model/noauth/NoAuthProbe.ts | 2 +- src/model/noauth/NoAuthProbeDescription.ts | 2 +- .../noauth/NoAuthProbeDescriptionHost.ts | 2 +- .../noauth/NoAuthProbeDescriptionNetwork.ts | 2 +- src/model/notification/Notification.ts | 16 +++++++-------- src/model/probe/Probe.ts | 2 +- src/model/probe/ProbeHost.ts | 4 ++-- src/model/probe/ProbeTask.ts | 2 +- src/model/sensor/Sensor.ts | 2 +- src/model/target/Target.ts | 4 ++-- 75 files changed, 198 insertions(+), 174 deletions(-) create mode 100644 .editorconfig create mode 100644 .vscode/settings.json create mode 100644 src/core/index.ts rename src/{model/commons => core/model}/Page.ts (100%) create mode 100644 src/core/model/PageParams.ts create mode 100644 src/core/model/index.ts rename src/{model/discovery => core/type}/CryptoType.ts (100%) rename src/{model/discovery => core/type}/PortType.ts (100%) create mode 100644 src/core/type/index.ts create mode 100644 src/model/apikey/index.ts create mode 100644 src/model/auth/index.ts delete mode 100644 src/model/commons/PageParams.ts delete mode 100644 src/model/discovery/DiscoveryStartInfo.ts create mode 100644 src/model/email/index.ts create mode 100644 src/model/history/index.ts create mode 100644 src/model/index.ts delete mode 100644 src/model/member/MemberStatus.ts diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..6e87a00 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,13 @@ +# Editor configuration, see http://editorconfig.org +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +max_line_length = off +trim_trailing_whitespace = false diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..d0e8374 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "editor.tabSize": 2, + "editor.insertSpaces": true, + + "git.ignoreLimitWarning": true +} \ No newline at end of file diff --git a/src/core/index.ts b/src/core/index.ts new file mode 100644 index 0000000..01808ae --- /dev/null +++ b/src/core/index.ts @@ -0,0 +1,2 @@ +export * from './model'; +export * from './type'; diff --git a/src/model/commons/Page.ts b/src/core/model/Page.ts similarity index 100% rename from src/model/commons/Page.ts rename to src/core/model/Page.ts diff --git a/src/core/model/PageParams.ts b/src/core/model/PageParams.ts new file mode 100644 index 0000000..9c6a908 --- /dev/null +++ b/src/core/model/PageParams.ts @@ -0,0 +1,6 @@ +export interface PageParams { + pageNo: number; + countPerPage: number; + sortCol: string; + sortDirection: string; +} diff --git a/src/core/model/index.ts b/src/core/model/index.ts new file mode 100644 index 0000000..46f7171 --- /dev/null +++ b/src/core/model/index.ts @@ -0,0 +1,2 @@ +export * from './Page'; +export * from './PageParams'; diff --git a/src/model/discovery/CryptoType.ts b/src/core/type/CryptoType.ts similarity index 100% rename from src/model/discovery/CryptoType.ts rename to src/core/type/CryptoType.ts diff --git a/src/model/discovery/PortType.ts b/src/core/type/PortType.ts similarity index 100% rename from src/model/discovery/PortType.ts rename to src/core/type/PortType.ts diff --git a/src/core/type/index.ts b/src/core/type/index.ts new file mode 100644 index 0000000..d5e47d5 --- /dev/null +++ b/src/core/type/index.ts @@ -0,0 +1,2 @@ +export * from './CryptoType'; +export * from './PortType'; diff --git a/src/index.ts b/src/index.ts index e69de29..344a5f0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -0,0 +1,2 @@ +export * from './core'; +export * from './model'; diff --git a/src/model/alert/Alert.ts b/src/model/alert/Alert.ts index 6ac3827..12c23be 100644 --- a/src/model/alert/Alert.ts +++ b/src/model/alert/Alert.ts @@ -1,4 +1,4 @@ export interface Alert { - created: string; - msg: string; + created: string; + msg: string; } \ No newline at end of file diff --git a/src/model/alert/AlertMetric.ts b/src/model/alert/AlertMetric.ts index 0b6925f..e4e2e27 100644 --- a/src/model/alert/AlertMetric.ts +++ b/src/model/alert/AlertMetric.ts @@ -1,5 +1,5 @@ -import {Alert} from './Alert'; +import { Alert } from './Alert'; export interface AlertMetric extends Alert { - status: string; - } + status: string; +} diff --git a/src/model/alert/AlertSystem.ts b/src/model/alert/AlertSystem.ts index 494d31a..813c24a 100644 --- a/src/model/alert/AlertSystem.ts +++ b/src/model/alert/AlertSystem.ts @@ -1,5 +1,5 @@ -import {Alert} from './Alert'; +import { Alert } from './Alert'; export interface AlertSystem extends Alert { - status?: string; // test - } + status?: string; // test +} diff --git a/src/model/apikey/ApiKey.ts b/src/model/apikey/ApiKey.ts index df50704..435aa90 100644 --- a/src/model/apikey/ApiKey.ts +++ b/src/model/apikey/ApiKey.ts @@ -1,8 +1,8 @@ -import {Domain} from '../domain'; +import { Domain } from '../domain'; export interface ApiKey { - id?: number; - apiKey?: string; - createDate?: Date; - domain?: Domain; + id?: number; + apiKey?: string; + createDate?: Date; + domain?: Domain; } diff --git a/src/model/apikey/index.ts b/src/model/apikey/index.ts new file mode 100644 index 0000000..3af301f --- /dev/null +++ b/src/model/apikey/index.ts @@ -0,0 +1 @@ +export * from './ApiKey'; diff --git a/src/model/auth/AuthCrawler.ts b/src/model/auth/AuthCrawler.ts index f4b487b..d064950 100644 --- a/src/model/auth/AuthCrawler.ts +++ b/src/model/auth/AuthCrawler.ts @@ -2,9 +2,9 @@ import { Target } from '../target'; import { MetaCrawler } from '../meta'; export interface AuthCrawler { - id?: number; - metaCrawler?: MetaCrawler; - target?: Target; - authJson?: string; - createDate?: Date; + id?: number; + metaCrawler?: MetaCrawler; + target?: Target; + authJson?: string; + createDate?: Date; } diff --git a/src/model/auth/index.ts b/src/model/auth/index.ts new file mode 100644 index 0000000..51e5576 --- /dev/null +++ b/src/model/auth/index.ts @@ -0,0 +1 @@ +export * from './AuthCrawler'; diff --git a/src/model/commons/PageParams.ts b/src/model/commons/PageParams.ts deleted file mode 100644 index 7d75951..0000000 --- a/src/model/commons/PageParams.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface PageParams { - pageNo: number; - countPerPage: number; - sortCol: string; - sortDirection: string; -} diff --git a/src/model/discovery/DiscoverHost.ts b/src/model/discovery/DiscoverHost.ts index f677528..0f42c0a 100644 --- a/src/model/discovery/DiscoverHost.ts +++ b/src/model/discovery/DiscoverHost.ts @@ -1,6 +1,5 @@ import { DiscoverPort } from "./DiscoverPort"; - export interface DiscoverHost { firstScanRangev4?: string; lastScanRangev4?: string; diff --git a/src/model/discovery/DiscoverZone.ts b/src/model/discovery/DiscoverZone.ts index 0959dec..5809873 100644 --- a/src/model/discovery/DiscoverZone.ts +++ b/src/model/discovery/DiscoverZone.ts @@ -3,4 +3,4 @@ import { DiscoverHost } from "./DiscoverHost"; export interface DiscoverZone { excludePatterns?: string[]; discoverHost?: DiscoverHost; -} \ No newline at end of file +} diff --git a/src/model/discovery/DiscoveryStartInfo.ts b/src/model/discovery/DiscoveryStartInfo.ts deleted file mode 100644 index 1e01439..0000000 --- a/src/model/discovery/DiscoveryStartInfo.ts +++ /dev/null @@ -1,11 +0,0 @@ -export interface DiscoveryStartInfo { - startIpv4?: string; - endIPv4?: string; - excludeIpv4?: string; - startIpv6?: string; - endIPv6?: string; - excludeIpv6?: string; - startPort?: string; - endPort?: string; - services?: string[]; -} diff --git a/src/model/discovery/Host.ts b/src/model/discovery/Host.ts index dd35fe1..070c164 100644 --- a/src/model/discovery/Host.ts +++ b/src/model/discovery/Host.ts @@ -2,15 +2,15 @@ import { Zone } from './Zone'; import { Port } from './Port'; export interface Host { - id?: number; - ipv4?: string; - ipv6?: string; - mac?: string; - os?: string; - discoveredDate?: Date; - zone?: Zone; - target?: boolean; + id?: number; + ipv4?: string; + ipv6?: string; + mac?: string; + os?: string; + discoveredDate?: Date; + zone?: Zone; + target?: boolean; - ports?: Map | null; - portList?: Port[] | null; + ports?: Map | null; + portList?: Port[] | null; } diff --git a/src/model/discovery/Port.ts b/src/model/discovery/Port.ts index 501557e..6020684 100644 --- a/src/model/discovery/Port.ts +++ b/src/model/discovery/Port.ts @@ -1,15 +1,15 @@ import { Host } from './Host'; -import { PortType } from './PortType'; import { Service } from './Service'; +import { PortType } from '../../core/type'; export interface Port { - id?: number; - portType?: PortType; - portNumber?: number; - discoveredDate?: Date; - host?: Host; - target?: boolean; + id?: number; + portType?: PortType; + portNumber?: number; + discoveredDate?: Date; + host?: Host; + target?: boolean; - services?: Map | null; - serviceList?: Service[] | null; + services?: Map | null; + serviceList?: Service[] | null; } diff --git a/src/model/discovery/Service.ts b/src/model/discovery/Service.ts index 66e9ba0..ac3a0c6 100644 --- a/src/model/discovery/Service.ts +++ b/src/model/discovery/Service.ts @@ -1,11 +1,11 @@ import { Port } from './Port'; -import { CryptoType } from './CryptoType'; +import { CryptoType } from '../../core/type'; export interface Service { - id?: number; - cryptoType?: CryptoType; - serviceName?: string; - discoveredDate?: Date; - port?: Port; - target?: boolean; + id?: number; + cryptoType?: CryptoType; + serviceName?: string; + discoveredDate?: Date; + port?: Port; + target?: boolean; } \ No newline at end of file diff --git a/src/model/discovery/index.ts b/src/model/discovery/index.ts index 076d52a..8166441 100644 --- a/src/model/discovery/index.ts +++ b/src/model/discovery/index.ts @@ -2,10 +2,8 @@ export * from './DiscoverHost'; export * from './DiscoverPort'; export * from './DiscoverService'; export * from './DiscoverZone'; -export * from './DiscoveryStartInfo'; + export * from './Host'; export * from './Port'; -export * from './PortType'; export * from './Service'; export * from './Zone'; - diff --git a/src/model/domain/Domain.ts b/src/model/domain/Domain.ts index ea6f1e5..50841d1 100644 --- a/src/model/domain/Domain.ts +++ b/src/model/domain/Domain.ts @@ -3,4 +3,4 @@ export interface Domain { id?: number; name?: string; createDate?: Date; -} \ No newline at end of file +} diff --git a/src/model/domain/DomainMember.ts b/src/model/domain/DomainMember.ts index 506c931..890d095 100644 --- a/src/model/domain/DomainMember.ts +++ b/src/model/domain/DomainMember.ts @@ -1,5 +1,5 @@ import { Domain } from './Domain'; -import {Member} from '../member'; +import { Member } from '../member'; export interface DomainMember { id?: number; diff --git a/src/model/email/EmailAuth.ts b/src/model/email/EmailAuth.ts index 61566f0..c069602 100644 --- a/src/model/email/EmailAuth.ts +++ b/src/model/email/EmailAuth.ts @@ -1,9 +1,9 @@ -import {Member} from '../member'; +import { Member } from '../member'; export interface EmailAuth { - id?: number; - emailAuthKey?: string; - createDate?: Date; - authConfirmDate?: Date; - member?: Member; -} \ No newline at end of file + id?: number; + emailAuthKey?: string; + createDate?: Date; + authConfirmDate?: Date; + member?: Member; +} diff --git a/src/model/email/index.ts b/src/model/email/index.ts new file mode 100644 index 0000000..2fd8339 --- /dev/null +++ b/src/model/email/index.ts @@ -0,0 +1 @@ +export * from './EmailAuth'; diff --git a/src/model/history/History.ts b/src/model/history/History.ts index 7d62dd2..a06e783 100644 --- a/src/model/history/History.ts +++ b/src/model/history/History.ts @@ -4,11 +4,11 @@ import { Member } from '../member'; import { Domain } from '../domain'; export interface History { - id?: number; - createDate?: Date; - metaHistoryType?: MetaHistoryType; - message?: string; - probe?: Probe; - member?: Member; - domain?: Domain; + id?: number; + createDate?: Date; + metaHistoryType?: MetaHistoryType; + message?: string; + probe?: Probe; + member?: Member; + domain?: Domain; } diff --git a/src/model/history/index.ts b/src/model/history/index.ts new file mode 100644 index 0000000..91a3211 --- /dev/null +++ b/src/model/history/index.ts @@ -0,0 +1 @@ +export * from './History'; diff --git a/src/model/index.ts b/src/model/index.ts new file mode 100644 index 0000000..7c6edee --- /dev/null +++ b/src/model/index.ts @@ -0,0 +1,16 @@ +export * from './alert'; +export * from './apikey'; +export * from './auth'; +export * from './discovery'; +export * from './domain'; +export * from './email'; +export * from './history'; +export * from './infra'; +export * from './member'; +export * from './meta'; +export * from './noauth'; +export * from './notification'; +export * from './probe'; +export * from './sensor'; +export * from './sensor-item'; +export * from './target'; diff --git a/src/model/infra/Infra.ts b/src/model/infra/Infra.ts index c0a6615..1b1488c 100644 --- a/src/model/infra/Infra.ts +++ b/src/model/infra/Infra.ts @@ -3,9 +3,9 @@ import { Probe } from '../probe'; import { Target } from '../target'; export interface Infra { - id?: number; - metaInfraType?: MetaInfraType; - createDate?: Date; - probe?: Probe; - target?: Target; + id?: number; + metaInfraType?: MetaInfraType; + createDate?: Date; + probe?: Probe; + target?: Target; } \ No newline at end of file diff --git a/src/model/infra/InfraHost.ts b/src/model/infra/InfraHost.ts index 0df979b..cb5d7e4 100644 --- a/src/model/infra/InfraHost.ts +++ b/src/model/infra/InfraHost.ts @@ -2,8 +2,8 @@ import { InfraOS } from './InfraOS'; import { Infra } from './Infra'; export interface InfraHost extends Infra { - infraOS?: InfraOS; - ipv4?: string; - ipv6?: string; - mac?: string; + infraOS?: InfraOS; + ipv4?: string; + ipv6?: string; + mac?: string; } \ No newline at end of file diff --git a/src/model/infra/InfraMachine.ts b/src/model/infra/InfraMachine.ts index f91bea9..af4e7c1 100644 --- a/src/model/infra/InfraMachine.ts +++ b/src/model/infra/InfraMachine.ts @@ -1,6 +1,5 @@ import { Infra } from './Infra'; - export interface InfraMachine extends Infra { - meta?: string; + meta?: string; } diff --git a/src/model/infra/InfraOS.ts b/src/model/infra/InfraOS.ts index dbc81e0..bc406cc 100644 --- a/src/model/infra/InfraOS.ts +++ b/src/model/infra/InfraOS.ts @@ -3,7 +3,7 @@ import { Infra } from './Infra'; import { MetaInfraVendor } from '../meta'; export interface InfraOS extends Infra { - infraMachine?: InfraMachine; - meta?: string; - metaInfraVendor?: MetaInfraVendor; + infraMachine?: InfraMachine; + meta?: string; + metaInfraVendor?: MetaInfraVendor; } \ No newline at end of file diff --git a/src/model/infra/InfraOSApplication.ts b/src/model/infra/InfraOSApplication.ts index 996b8c2..230953b 100644 --- a/src/model/infra/InfraOSApplication.ts +++ b/src/model/infra/InfraOSApplication.ts @@ -2,6 +2,6 @@ import { InfraOS } from './InfraOS'; import { Infra } from './Infra'; export interface InfraOSApplication extends Infra { - infraOS?: InfraOS; - name?: string; + infraOS?: InfraOS; + name?: string; } \ No newline at end of file diff --git a/src/model/infra/InfraOSDaemon.ts b/src/model/infra/InfraOSDaemon.ts index 9773289..ce0a919 100644 --- a/src/model/infra/InfraOSDaemon.ts +++ b/src/model/infra/InfraOSDaemon.ts @@ -2,6 +2,6 @@ import { InfraOS } from './InfraOS'; import { Infra } from './Infra'; export interface InfraOSDaemon extends Infra { - infraOS?: InfraOS; - name?: string; + infraOS?: InfraOS; + name?: string; } \ No newline at end of file diff --git a/src/model/infra/InfraOSPort.ts b/src/model/infra/InfraOSPort.ts index 7cda289..31f5972 100644 --- a/src/model/infra/InfraOSPort.ts +++ b/src/model/infra/InfraOSPort.ts @@ -3,9 +3,9 @@ import { Infra } from './Infra'; import { MetaInfraVendor } from '../meta'; export interface InfraOSPort extends Infra { - infraOS?: InfraOS; - port?: number; - portType?: string; - metaInfraVendor?: MetaInfraVendor; - tlsType?: boolean; + infraOS?: InfraOS; + port?: number; + portType?: string; + metaInfraVendor?: MetaInfraVendor; + tlsType?: boolean; } \ No newline at end of file diff --git a/src/model/infra/InfraService.ts b/src/model/infra/InfraService.ts index 73dec3f..f695ed6 100644 --- a/src/model/infra/InfraService.ts +++ b/src/model/infra/InfraService.ts @@ -3,9 +3,9 @@ import { Infra } from './Infra'; import { MetaInfraVendor } from '../meta'; export interface InfraService extends Infra { - infraHost?: InfraHost; - portType?: string; - port?: number; - metaInfraVendor?: MetaInfraVendor; - tlsType?: boolean; + infraHost?: InfraHost; + portType?: string; + port?: number; + metaInfraVendor?: MetaInfraVendor; + tlsType?: boolean; } \ No newline at end of file diff --git a/src/model/infra/index.ts b/src/model/infra/index.ts index 11a43d5..8219901 100644 --- a/src/model/infra/index.ts +++ b/src/model/infra/index.ts @@ -1,8 +1,8 @@ +export * from './Infra'; export * from './InfraHost'; export * from './InfraMachine'; +export * from './InfraOS'; export * from './InfraOSApplication'; export * from './InfraOSDaemon'; export * from './InfraOSPort'; -export * from './InfraOS'; export * from './InfraService'; -export * from './Infra'; diff --git a/src/model/member/Member.ts b/src/model/member/Member.ts index c08f680..ced975b 100644 --- a/src/model/member/Member.ts +++ b/src/model/member/Member.ts @@ -11,4 +11,4 @@ export interface Member { metaMemberStatus?: MetaMemberStatus; signinFailCount?: number; totpType?: boolean; -} \ No newline at end of file +} diff --git a/src/model/member/MemberStatus.ts b/src/model/member/MemberStatus.ts deleted file mode 100644 index a8ddc37..0000000 --- a/src/model/member/MemberStatus.ts +++ /dev/null @@ -1,6 +0,0 @@ -export enum MemberStatus { - NOAUTH = 1, - NORMAL = 2, - DORMANCY = 3, - WITHDRAWAL = 4, -} diff --git a/src/model/member/MemberTotp.ts b/src/model/member/MemberTotp.ts index 29131ac..ebd1c68 100644 --- a/src/model/member/MemberTotp.ts +++ b/src/model/member/MemberTotp.ts @@ -1,4 +1,4 @@ -import {Member} from './Member'; +import { Member } from './Member'; export interface MemberTotp { id?: number; @@ -7,4 +7,4 @@ export interface MemberTotp { createDate?: Date; updateDate?: Date; otpAuth?: string; -} \ No newline at end of file +} diff --git a/src/model/member/index.ts b/src/model/member/index.ts index fbffb37..2ca8e0a 100644 --- a/src/model/member/index.ts +++ b/src/model/member/index.ts @@ -1,2 +1,2 @@ export * from './Member'; -export * from './MemberTotp'; \ No newline at end of file +export * from './MemberTotp'; diff --git a/src/model/meta/MetaCrawler.ts b/src/model/meta/MetaCrawler.ts index a2a74c7..4394023 100644 --- a/src/model/meta/MetaCrawler.ts +++ b/src/model/meta/MetaCrawler.ts @@ -5,7 +5,7 @@ export interface MetaCrawler { description?: string; } -export enum MetaCrawler_ID { +export enum MetaCrawlerEnum { ACTIVEDIRECTORY_CRAWLER = 1, CASSANDRA_CRAWLER = 2, DHCP_CRAWLER = 3, diff --git a/src/model/meta/MetaCrawlerInputItem.ts b/src/model/meta/MetaCrawlerInputItem.ts index b91a887..74cfe2f 100644 --- a/src/model/meta/MetaCrawlerInputItem.ts +++ b/src/model/meta/MetaCrawlerInputItem.ts @@ -13,4 +13,4 @@ export interface MetaCrawlerInputItem { pattern?: string; keyName?: string; keyValue?: string; -} \ No newline at end of file +} diff --git a/src/model/meta/MetaHistoryType.ts b/src/model/meta/MetaHistoryType.ts index 4db82f8..62211e3 100644 --- a/src/model/meta/MetaHistoryType.ts +++ b/src/model/meta/MetaHistoryType.ts @@ -4,7 +4,7 @@ export interface MetaHistoryType { createDate?: Date; } -export enum MetaHistoryType_ID { +export enum MetaHistoryTypeEnum { Member = 1, Probe = 2, Discovery = 3, diff --git a/src/model/meta/MetaInfraType.ts b/src/model/meta/MetaInfraType.ts index 05057fa..bd8585f 100644 --- a/src/model/meta/MetaInfraType.ts +++ b/src/model/meta/MetaInfraType.ts @@ -5,7 +5,7 @@ export interface MetaInfraType { } -export enum MetaInfraType_ID { +export enum MetaInfraTypeEnum { MACHINE = 1, HOST = 2, OS = 3, diff --git a/src/model/meta/MetaMemberStatus.ts b/src/model/meta/MetaMemberStatus.ts index 1ff7773..d85afef 100644 --- a/src/model/meta/MetaMemberStatus.ts +++ b/src/model/meta/MetaMemberStatus.ts @@ -4,7 +4,7 @@ export interface MetaMemberStatus { name?: string; } -export enum MetaMemberStatus_ID { +export enum MetaMemberStatusEnum { NOAUTH = 1, NORMAL = 2, DIAPAUSE = 3, diff --git a/src/model/meta/MetaNoAuthProbeStatus.ts b/src/model/meta/MetaNoAuthProbeStatus.ts index fd91a3f..d93bbb1 100644 --- a/src/model/meta/MetaNoAuthProbeStatus.ts +++ b/src/model/meta/MetaNoAuthProbeStatus.ts @@ -4,7 +4,7 @@ export interface MetaNoAuthProbeStatus { name?: string; } -export enum MetaNoAuthProbeStatus_ID { +export enum MetaNoAuthProbeStatusEnum { ACCEPT = 1, DENY = 2, PROCESS = 3, diff --git a/src/model/meta/MetaNotification.ts b/src/model/meta/MetaNotification.ts index 74fd26c..971cd04 100644 --- a/src/model/meta/MetaNotification.ts +++ b/src/model/meta/MetaNotification.ts @@ -4,4 +4,4 @@ export interface MetaNotification { createDate?: Date; name?: string; description?: string; -} \ No newline at end of file +} diff --git a/src/model/meta/MetaProbeArchitecture.ts b/src/model/meta/MetaProbeArchitecture.ts index 0bcfdb7..69fe965 100644 --- a/src/model/meta/MetaProbeArchitecture.ts +++ b/src/model/meta/MetaProbeArchitecture.ts @@ -5,7 +5,6 @@ export interface MetaProbeArchitecture { createDate?: Date; } -export enum MetaProbeArchitecture_ID { +export enum MetaProbeArchitectureEnum { x86_64bit = 1, } - diff --git a/src/model/meta/MetaProbeOs.ts b/src/model/meta/MetaProbeOs.ts index c196704..2ddd275 100644 --- a/src/model/meta/MetaProbeOs.ts +++ b/src/model/meta/MetaProbeOs.ts @@ -5,7 +5,7 @@ export interface MetaProbeOs { createDate?: Date; } -export enum MetaProbeOs_ID { +export enum MetaProbeOsEnum { Windows = 1, Debian = 2, Ubuntu = 3, diff --git a/src/model/meta/MetaProbePackage.ts b/src/model/meta/MetaProbePackage.ts index 56c29d4..eb7f3c8 100644 --- a/src/model/meta/MetaProbePackage.ts +++ b/src/model/meta/MetaProbePackage.ts @@ -8,4 +8,4 @@ export interface MetaProbePackage { metaProbeOs?: MetaProbeOs; metaProbeArchitecture?: MetaProbeArchitecture; createDate?: Date; -} \ No newline at end of file +} diff --git a/src/model/meta/MetaProbeStatus.ts b/src/model/meta/MetaProbeStatus.ts index 1b01f1d..648d3a4 100644 --- a/src/model/meta/MetaProbeStatus.ts +++ b/src/model/meta/MetaProbeStatus.ts @@ -4,7 +4,7 @@ export interface MetaProbeStatus { name?: string; } -export enum MetaProbeStatus_ID { +export enum MetaProbeStatusEnum { INITIAL = 1, NORMAL = 2, } diff --git a/src/model/meta/MetaProbeVersion.ts b/src/model/meta/MetaProbeVersion.ts index 97aaf9b..e819518 100644 --- a/src/model/meta/MetaProbeVersion.ts +++ b/src/model/meta/MetaProbeVersion.ts @@ -3,4 +3,4 @@ export interface MetaProbeVersion { id?: number; version?: string; createDate?: Date; -} \ No newline at end of file +} diff --git a/src/model/meta/MetaSensorDisplayItem.ts b/src/model/meta/MetaSensorDisplayItem.ts index e53da31..5e00072 100644 --- a/src/model/meta/MetaSensorDisplayItem.ts +++ b/src/model/meta/MetaSensorDisplayItem.ts @@ -4,13 +4,13 @@ import { MetaSensorItemType } from './MetaSensorItemType'; export interface MetaSensorDisplayItem { - id?: number; - key?: string; - displayName?: string; - description?: string; - metaCrawler?: MetaCrawler; - metaSensorItemUnit?: MetaSensorItemUnit; - createDate?: Date; - metaSensorItemType?: MetaSensorItemType; - default?: boolean; -} \ No newline at end of file + id?: number; + key?: string; + displayName?: string; + description?: string; + metaCrawler?: MetaCrawler; + metaSensorItemUnit?: MetaSensorItemUnit; + createDate?: Date; + metaSensorItemType?: MetaSensorItemType; + default?: boolean; +} diff --git a/src/model/meta/MetaSensorDisplayMapping.ts b/src/model/meta/MetaSensorDisplayMapping.ts index 22afe0d..ddf0f0d 100644 --- a/src/model/meta/MetaSensorDisplayMapping.ts +++ b/src/model/meta/MetaSensorDisplayMapping.ts @@ -2,7 +2,7 @@ import { MetaSensorDisplayItem } from './MetaSensorDisplayItem'; import { MetaSensorItemKey } from './MetaSensorItemKey'; export interface MetaSensorDisplayMapping { - id?: number; - metaSensorDisplayItem?: MetaSensorDisplayItem; - metaSensorItemKey?: MetaSensorItemKey; -} \ No newline at end of file + id?: number; + metaSensorDisplayItem?: MetaSensorDisplayItem; + metaSensorItemKey?: MetaSensorItemKey; +} diff --git a/src/model/meta/MetaSensorItem.ts b/src/model/meta/MetaSensorItem.ts index 50275aa..188782f 100644 --- a/src/model/meta/MetaSensorItem.ts +++ b/src/model/meta/MetaSensorItem.ts @@ -4,4 +4,4 @@ export interface MetaSensorItem { key?: string; name?: string; createDate?: Date; -} \ No newline at end of file +} diff --git a/src/model/meta/MetaSensorItemKey.ts b/src/model/meta/MetaSensorItemKey.ts index 4b53abe..7c408e3 100644 --- a/src/model/meta/MetaSensorItemKey.ts +++ b/src/model/meta/MetaSensorItemKey.ts @@ -11,4 +11,4 @@ export interface MetaSensorItemKey { metaCrawler?: MetaCrawler; createDate?: Date; metaSensorItemUnit?: MetaSensorItemUnit; -} \ No newline at end of file +} diff --git a/src/model/meta/MetaSensorItemType.ts b/src/model/meta/MetaSensorItemType.ts index 144ddfc..297c335 100644 --- a/src/model/meta/MetaSensorItemType.ts +++ b/src/model/meta/MetaSensorItemType.ts @@ -4,4 +4,4 @@ export interface MetaSensorItemType { name?: string; description?: string; createDate?: Date; -} \ No newline at end of file +} diff --git a/src/model/meta/MetaSensorItemUnit.ts b/src/model/meta/MetaSensorItemUnit.ts index 5aa8899..822e5e6 100644 --- a/src/model/meta/MetaSensorItemUnit.ts +++ b/src/model/meta/MetaSensorItemUnit.ts @@ -4,4 +4,4 @@ export interface MetaSensorItemUnit { unit?: string; createDate?: Date; mark?: string; -} \ No newline at end of file +} diff --git a/src/model/meta/MetaSensorStatus.ts b/src/model/meta/MetaSensorStatus.ts index be82dac..df063f8 100644 --- a/src/model/meta/MetaSensorStatus.ts +++ b/src/model/meta/MetaSensorStatus.ts @@ -4,7 +4,7 @@ export interface MetaSensorStatus { name?: string; } -export enum MetaSensorStatus_ID { +export enum MetaSensorStatusEnum { RUNNING = 1, STOPPED = 2, } diff --git a/src/model/meta/index.ts b/src/model/meta/index.ts index bb86844..5d4b8c5 100644 --- a/src/model/meta/index.ts +++ b/src/model/meta/index.ts @@ -22,4 +22,3 @@ export * from './MetaSensorItemUnit'; export * from './MetaSensorStatus'; export * from './MetaVendorCrawler'; export * from './MetaVendorCrawlerSensorItem'; - diff --git a/src/model/noauth/NoAuthProbe.ts b/src/model/noauth/NoAuthProbe.ts index 9c37d98..9b3bb50 100644 --- a/src/model/noauth/NoAuthProbe.ts +++ b/src/model/noauth/NoAuthProbe.ts @@ -15,4 +15,4 @@ export interface NoAuthProbe { probe?: Probe; connectAddress?: string; connectDate?: Date; -} \ No newline at end of file +} diff --git a/src/model/noauth/NoAuthProbeDescription.ts b/src/model/noauth/NoAuthProbeDescription.ts index a6ebf2d..b360d8d 100644 --- a/src/model/noauth/NoAuthProbeDescription.ts +++ b/src/model/noauth/NoAuthProbeDescription.ts @@ -4,4 +4,4 @@ import { NoAuthProbeDescriptionNetwork } from './NoAuthProbeDescriptionNetwork'; export interface NoAuthProbeDescription { host?: NoAuthProbeDescriptionHost; network?: NoAuthProbeDescriptionNetwork -} \ No newline at end of file +} diff --git a/src/model/noauth/NoAuthProbeDescriptionHost.ts b/src/model/noauth/NoAuthProbeDescriptionHost.ts index a195f2c..e7cfefe 100644 --- a/src/model/noauth/NoAuthProbeDescriptionHost.ts +++ b/src/model/noauth/NoAuthProbeDescriptionHost.ts @@ -6,4 +6,4 @@ export interface NoAuthProbeDescriptionHost { platformVersion?: string; kernelVersion?: string; hostID?: string; -} \ No newline at end of file +} diff --git a/src/model/noauth/NoAuthProbeDescriptionNetwork.ts b/src/model/noauth/NoAuthProbeDescriptionNetwork.ts index 3a5be16..8d013a1 100644 --- a/src/model/noauth/NoAuthProbeDescriptionNetwork.ts +++ b/src/model/noauth/NoAuthProbeDescriptionNetwork.ts @@ -3,4 +3,4 @@ export interface NoAuthProbeDescriptionNetwork { address?: string; gateway?: string; macAddress?: string; -} \ No newline at end of file +} diff --git a/src/model/notification/Notification.ts b/src/model/notification/Notification.ts index 0ea5eca..47fc666 100644 --- a/src/model/notification/Notification.ts +++ b/src/model/notification/Notification.ts @@ -1,11 +1,11 @@ -import {Member} from '../member'; +import { Member } from '../member'; export interface Notification { - id?: number; - createDate?: Date; - title?: string; - message?: string; - member?: Member; - confirmDate?: Date; - url?: string; + 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 index cafff06..f952bb3 100644 --- a/src/model/probe/Probe.ts +++ b/src/model/probe/Probe.ts @@ -17,4 +17,4 @@ export interface Probe { targetCount?: number; connectDate?: Date; connectAddress?: string; -} \ No newline at end of file +} diff --git a/src/model/probe/ProbeHost.ts b/src/model/probe/ProbeHost.ts index 8c002d4..2123d0a 100644 --- a/src/model/probe/ProbeHost.ts +++ b/src/model/probe/ProbeHost.ts @@ -1,8 +1,8 @@ import { Probe } from './Probe'; -import {InfraHost} from '../infra'; +import { InfraHost } from '../infra'; export interface ProbeHost { id?: number; probe?: Probe; infraHost?: InfraHost; -} \ No newline at end of file +} diff --git a/src/model/probe/ProbeTask.ts b/src/model/probe/ProbeTask.ts index 4403a3c..f64b42e 100644 --- a/src/model/probe/ProbeTask.ts +++ b/src/model/probe/ProbeTask.ts @@ -11,4 +11,4 @@ export interface ProbeTask { startDate?: Date; endDate?: Date; succeed?: boolean; -} \ No newline at end of file +} diff --git a/src/model/sensor/Sensor.ts b/src/model/sensor/Sensor.ts index d3f0ae4..13a5f7f 100644 --- a/src/model/sensor/Sensor.ts +++ b/src/model/sensor/Sensor.ts @@ -10,4 +10,4 @@ export interface Sensor { metaCrawler?: 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 index 75b82fa..c3e5b54 100644 --- a/src/model/target/Target.ts +++ b/src/model/target/Target.ts @@ -1,4 +1,4 @@ -import {Sensor} from '../sensor'; +import { Sensor } from '../sensor'; export interface Target { id?: number; @@ -6,4 +6,4 @@ export interface Target { displayName?: string; description?: string; sensors?: Sensor[]; -} \ No newline at end of file +}