From 4b700b6ecbcfdcbcb656a3a556f64a78f5bb77a9 Mon Sep 17 00:00:00 2001 From: crusader Date: Tue, 5 Jun 2018 18:08:52 +0900 Subject: [PATCH] ing --- model/infra/Infra.go | 2 +- model/infra/InfraOS.go | 2 +- model/infra/InfraOSPort.go | 2 +- model/infra/InfraServiceApplication.go | 2 +- model/member/Member.go | 20 ++++++++++---------- model/meta/MetaCrawler.go | 10 +++++----- model/meta/MetaInfraVendor.go | 8 ++++---- model/meta/MetaSensorDisplayItem.go | 12 ++++++------ model/meta/MetaSensorItem.go | 10 +++++----- model/meta/MetaSensorItemKey.go | 16 ++++++++-------- model/noauthprobe/NoAuthProbe.go | 20 ++++++++++---------- model/probe/Probe.go | 2 +- model/sensor/Sensor.go | 4 ++-- model/sensor/SensorItem.go | 2 +- model/sensor/SensorItemDependency.go | 6 +++--- 15 files changed, 59 insertions(+), 59 deletions(-) diff --git a/model/infra/Infra.go b/model/infra/Infra.go index b4590f6..d85dc18 100644 --- a/model/infra/Infra.go +++ b/model/infra/Infra.go @@ -11,7 +11,7 @@ import ( type Infra struct { ID json.Number `json:"id,Number,omitempty"` - MetaInfraType *meta.MetaInfraType `json:"type,omitempty"` + MetaInfraType *meta.MetaInfraType `json:"metaInfraType,omitempty"` CreateDate *util.Timestamp `json:"createDate,omitempty"` Probe *probe.Probe `json:"probe,omitempty"` Target *target.Target `json:"target,omitempty"` diff --git a/model/infra/InfraOS.go b/model/infra/InfraOS.go index 232368b..822ce31 100644 --- a/model/infra/InfraOS.go +++ b/model/infra/InfraOS.go @@ -10,5 +10,5 @@ type InfraOS struct { InfraMachine *InfraMachine `json:"machine,omitempty"` Meta string `json:"meta,omitempty"` CreateDate *util.Timestamp `json:"createDate,omitempty"` - MetaInfraVendor *meta.MetaInfraVendor `json:"vendor,omitempty"` + MetaInfraVendor *meta.MetaInfraVendor `json:"metaInfraVendor,omitempty"` } diff --git a/model/infra/InfraOSPort.go b/model/infra/InfraOSPort.go index 71049f7..5410f46 100644 --- a/model/infra/InfraOSPort.go +++ b/model/infra/InfraOSPort.go @@ -13,6 +13,6 @@ type InfraOSPort struct { CreateDate *util.Timestamp `json:"createDate,omitempty"` Port json.Number `json:"port,omitempty"` PortType string `json:"portType,omitempty"` - MetaInfraVendor *meta.MetaInfraVendor `json:"vendor,omitempty"` + MetaInfraVendor *meta.MetaInfraVendor `json:"metaInfraVendor,omitempty"` TLSType bool `json:"tlsType,omitempty"` } diff --git a/model/infra/InfraServiceApplication.go b/model/infra/InfraServiceApplication.go index d769036..3a0a560 100644 --- a/model/infra/InfraServiceApplication.go +++ b/model/infra/InfraServiceApplication.go @@ -12,7 +12,7 @@ type InfraServiceApplication struct { InfraHost *InfraHost `json:"host,omitempty"` PortType string `json:"portType,omitempty"` Port json.Number `json:"port,omitempty"` - MetaInfraVendor *meta.MetaInfraVendor `json:"vendor,omitempty"` + MetaInfraVendor *meta.MetaInfraVendor `json:"metaInfraVendor,omitempty"` CreateDate *util.Timestamp `json:"createDate,omitempty"` TLSType bool `json:"tlsType,omitempty"` } diff --git a/model/member/Member.go b/model/member/Member.go index 05b45bd..3f25e7d 100644 --- a/model/member/Member.go +++ b/model/member/Member.go @@ -8,14 +8,14 @@ import ( ) type Member struct { - ID json.Number `json:"id,Number,omitempty"` - Email string `json:"email,omitempty"` - Pw string `json:"pw,omitempty"` - Name string `json:"name,omitempty"` - Phone string `json:"phone,omitempty"` - CompanyName string `json:"companyName,omitempty"` - CreateDate *util.Timestamp `json:"createDate,omitempty"` - Status *meta.MetaMemberStatus `json:"status,omitempty"` - SigninFailCount int `json:"signinFailCount,omitempty"` - TotpType bool `json:"totpType,omitempty"` + ID json.Number `json:"id,Number,omitempty"` + Email string `json:"email,omitempty"` + Pw string `json:"pw,omitempty"` + Name string `json:"name,omitempty"` + Phone string `json:"phone,omitempty"` + CompanyName string `json:"companyName,omitempty"` + CreateDate *util.Timestamp `json:"createDate,omitempty"` + MetaMemberStatus *meta.MetaMemberStatus `json:"metaMemberStatus,omitempty"` + SigninFailCount int `json:"signinFailCount,omitempty"` + TotpType bool `json:"totpType,omitempty"` } diff --git a/model/meta/MetaCrawler.go b/model/meta/MetaCrawler.go index 0c1755f..6fa4da7 100644 --- a/model/meta/MetaCrawler.go +++ b/model/meta/MetaCrawler.go @@ -7,9 +7,9 @@ import ( ) type MetaCrawler struct { - ID json.Number `json:"id,Number,omitempty"` - Name string `json:"name,omitempty"` - Description string `json:"description,omitempty"` - CreateDate *util.Timestamp `json:"createDate,omitempty"` - Container *MetaContainer `json:"container,omitempty"` + ID json.Number `json:"id,Number,omitempty"` + Name string `json:"name,omitempty"` + Description string `json:"description,omitempty"` + CreateDate *util.Timestamp `json:"createDate,omitempty"` + MetaContainer *MetaContainer `json:"metaContainer,omitempty"` } diff --git a/model/meta/MetaInfraVendor.go b/model/meta/MetaInfraVendor.go index b3f8281..13f8138 100644 --- a/model/meta/MetaInfraVendor.go +++ b/model/meta/MetaInfraVendor.go @@ -7,8 +7,8 @@ import ( ) type MetaInfraVendor struct { - ID json.Number `json:"id,Number,omitempty"` - Name string `json:"name,omitempty"` - CreateDate *util.Timestamp `json:"createDate,omitempty"` - InfraType *MetaInfraType `json:"infraType,omitempty"` + ID json.Number `json:"id,Number,omitempty"` + Name string `json:"name,omitempty"` + CreateDate *util.Timestamp `json:"createDate,omitempty"` + MetaInfraType *MetaInfraType `json:"metaInfraType,omitempty"` } diff --git a/model/meta/MetaSensorDisplayItem.go b/model/meta/MetaSensorDisplayItem.go index fe531c3..55a7571 100644 --- a/model/meta/MetaSensorDisplayItem.go +++ b/model/meta/MetaSensorDisplayItem.go @@ -7,10 +7,10 @@ import ( ) type MetaSensorDisplayItem struct { - ID json.Number `json:"id,Number,omitempty"` - Name string `json:"name,omitempty"` - Crawler *MetaCrawler `json:"crawler,omitempty"` - Unit *MetaSensorItemUnit `json:"unit,omitempty"` - CreateDate *util.Timestamp `json:"createDate,omitempty"` - ItemType *MetaSensorItemType `json:"itemType,omitempty"` + ID json.Number `json:"id,Number,omitempty"` + Name string `json:"name,omitempty"` + MetaCrawler *MetaCrawler `json:"metaCrawler,omitempty"` + MetaSensorItemUnit *MetaSensorItemUnit `json:"metaSensorItemUnit,omitempty"` + CreateDate *util.Timestamp `json:"createDate,omitempty"` + MetaSensorItemType *MetaSensorItemType `json:"metaSensorItemType,omitempty"` } diff --git a/model/meta/MetaSensorItem.go b/model/meta/MetaSensorItem.go index 5d6ba61..a23f215 100644 --- a/model/meta/MetaSensorItem.go +++ b/model/meta/MetaSensorItem.go @@ -7,9 +7,9 @@ import ( ) type MetaSensorItem struct { - ID json.Number `json:"id,Number,omitempty"` - SensorItemType *MetaSensorItemType `json:"sensorItemType,omitempty"` - Key string `json:"key,omitempty"` - Name string `json:"name,omitempty"` - CreateDate *util.Timestamp `json:"createDate,omitempty"` + ID json.Number `json:"id,Number,omitempty"` + MetaSensorItemType *MetaSensorItemType `json:"metaSensorItemType,omitempty"` + Key string `json:"key,omitempty"` + Name string `json:"name,omitempty"` + CreateDate *util.Timestamp `json:"createDate,omitempty"` } diff --git a/model/meta/MetaSensorItemKey.go b/model/meta/MetaSensorItemKey.go index da907d0..e3156b1 100644 --- a/model/meta/MetaSensorItemKey.go +++ b/model/meta/MetaSensorItemKey.go @@ -7,12 +7,12 @@ import ( ) type MetaSensorItemKey struct { - ID json.Number `json:"id,Number,omitempty"` - Item *MetaSensorItem `json:"item,omitempty"` - Key string `json:"key,omitempty"` - Froms string `json:"froms,omitempty"` - Option string `json:"option,omitempty"` - Crawler *MetaCrawler `json:"crawler,omitempty"` - CreateDate *util.Timestamp `json:"createDate,omitempty"` - Unit *MetaSensorItemUnit `json:"unit,omitempty"` + ID json.Number `json:"id,Number,omitempty"` + MetaSensorItem *MetaSensorItem `json:"metaSensorItem,omitempty"` + Key string `json:"key,omitempty"` + Froms string `json:"froms,omitempty"` + Option string `json:"option,omitempty"` + MetaCrawler *MetaCrawler `json:"metaCrawler,omitempty"` + CreateDate *util.Timestamp `json:"createDate,omitempty"` + MetaSensorItemUnit *MetaSensorItemUnit `json:"metaSensorItemUnit,omitempty"` } diff --git a/model/noauthprobe/NoAuthProbe.go b/model/noauthprobe/NoAuthProbe.go index 601b848..8185e8a 100644 --- a/model/noauthprobe/NoAuthProbe.go +++ b/model/noauthprobe/NoAuthProbe.go @@ -10,14 +10,14 @@ import ( ) type NoAuthProbe struct { - ID json.Number `json:"id,Number,omitempty"` - Description string `json:"description,omitempty"` - Status *meta.MetaNoAuthProbeStatus `json:"status,omitempty"` - TempProbeKey string `json:"tempProbeKey,omitempty"` - CreateDate *util.Timestamp `json:"createDate,omitempty"` - APIKey string `json:"apiKey,omitempty"` - Domain *domain.DomainMember `json:"domain,omitempty"` - Probe *probe.Probe `json:"probe,omitempty"` - ConnectDate *util.Timestamp `json:"connectDate,omitempty"` - ConnectAddress string `json:"connectAddress,omitempty"` + ID json.Number `json:"id,Number,omitempty"` + Description string `json:"description,omitempty"` + MetaNoAuthProbeStatus *meta.MetaNoAuthProbeStatus `json:"metaNoAuthProbeStatus,omitempty"` + TempProbeKey string `json:"tempProbeKey,omitempty"` + CreateDate *util.Timestamp `json:"createDate,omitempty"` + APIKey string `json:"apiKey,omitempty"` + Domain *domain.DomainMember `json:"domain,omitempty"` + Probe *probe.Probe `json:"probe,omitempty"` + ConnectDate *util.Timestamp `json:"connectDate,omitempty"` + ConnectAddress string `json:"connectAddress,omitempty"` } diff --git a/model/probe/Probe.go b/model/probe/Probe.go index 80a7fc4..bcda4e7 100644 --- a/model/probe/Probe.go +++ b/model/probe/Probe.go @@ -11,7 +11,7 @@ import ( type Probe struct { ID json.Number `json:"id,Number,omitempty"` - Status *meta.MetaProbeStatus `json:"status,omitempty"` + MetaProbeStatus *meta.MetaProbeStatus `json:"metaProbeStatus,omitempty"` Description string `json:"description,omitempty"` CreateDate *util.Timestamp `json:"createDate,omitempty"` Domain *domain.Domain `json:"domain,omitempty"` diff --git a/model/sensor/Sensor.go b/model/sensor/Sensor.go index 011f367..4373472 100644 --- a/model/sensor/Sensor.go +++ b/model/sensor/Sensor.go @@ -12,8 +12,8 @@ type Sensor struct { ID json.Number `json:"id,Number,omitempty"` CreateDate *util.Timestamp `json:"createDate,omitempty"` Description string `json:"description,omitempty"` - MetaSensorStatus *meta.MetaSensorStatus `json:"status,omitempty"` + MetaSensorStatus *meta.MetaSensorStatus `json:"metaSensorStatus,omitempty"` Target *target.Target `json:"target,omitempty"` - Crawler *meta.MetaCrawler `json:"crawler,omitempty"` + MetaCrawler *meta.MetaCrawler `json:"metaCrawler,omitempty"` CrawlerInputItems string `json:"crawlerInputItems,omitempty"` } diff --git a/model/sensor/SensorItem.go b/model/sensor/SensorItem.go index 9f8a5f9..89e1b74 100644 --- a/model/sensor/SensorItem.go +++ b/model/sensor/SensorItem.go @@ -10,6 +10,6 @@ import ( type SensorItem struct { ID json.Number `json:"id,Number,omitempty"` Sensor *Sensor `json:"sensor,omitempty"` - MetaSensorItem *meta.MetaSensorItem `json:"item,omitempty"` + MetaSensorItem *meta.MetaSensorItem `json:"metaSensorItem,omitempty"` CreateDate *util.Timestamp `json:"createDate,omitempty"` } diff --git a/model/sensor/SensorItemDependency.go b/model/sensor/SensorItemDependency.go index a935300..ead3969 100644 --- a/model/sensor/SensorItemDependency.go +++ b/model/sensor/SensorItemDependency.go @@ -7,7 +7,7 @@ import ( ) type SensorItemDependency struct { - ID json.Number `json:"id,Number,omitempty"` - DisplayItem *meta.MetaSensorDisplayItem `json:"displayItem,omitempty"` - SensorItem *meta.MetaSensorItemKey `json:"sensorItem,omitempty"` + ID json.Number `json:"id,Number,omitempty"` + MetaSensorDisplayItem *meta.MetaSensorDisplayItem `json:"metaSensorDisplayItem,omitempty"` + MetaSensorItemKey *meta.MetaSensorItemKey `json:"metaSensorItemKey,omitempty"` }