From 925979e5570ab981c425d6975b0180ce48de5e09 Mon Sep 17 00:00:00 2001 From: snoop Date: Mon, 26 Jun 2017 14:50:56 +0900 Subject: [PATCH] FIXED META --- proxy/meta/meta_noauth_probe_status.go | 6 ++-- proxy/meta/meta_probe_status.go | 25 +++++++++++++-- proxy/noauthprobe/noauth_probe_service.go | 11 ++++--- proxy/probe/probe_service.go | 8 ++--- proxy/probe/probe_service_test.go | 38 ++++++++++++++--------- 5 files changed, 59 insertions(+), 29 deletions(-) diff --git a/proxy/meta/meta_noauth_probe_status.go b/proxy/meta/meta_noauth_probe_status.go index 5867117..50a651b 100644 --- a/proxy/meta/meta_noauth_probe_status.go +++ b/proxy/meta/meta_noauth_probe_status.go @@ -6,9 +6,9 @@ import ( ) const ( - PROBE_STATUS_ACCEPT = 1 - PROBE_STATUS_DENY = 2 - PROBE_STATUS_PROCESS = 3 + NOAUTH_PROBE_STATUS_ACCEPT = 1 + NOAUTH_PROBE_STATUS_DENY = 2 + NOAUTH_PROBE_STATUS_PROCESS = 3 ) var metaNoauthProbeStatusMap = map[int]string{ diff --git a/proxy/meta/meta_probe_status.go b/proxy/meta/meta_probe_status.go index 0d9bdcb..a8f5d68 100644 --- a/proxy/meta/meta_probe_status.go +++ b/proxy/meta/meta_probe_status.go @@ -1,15 +1,34 @@ package meta -import "encoding/json" +import ( + "encoding/json" + "strconv" +) const ( - INITIAL = 1 - NORMAL = 2 + PROBE_STATUS_INITIAL = 1 + PROBE_STATUS_NORMAL = 2 ) +var metaProbeStatusMap = map[int]string{ + 1: "INITIAL", + 2: "NORMAL", +} type MetaProbeStatus struct { Id json.Number `json:"id,Number,omitempty"` Name string `json:"name,omitempty"` } +func NewMetaProbeStatus(types int) *MetaProbeStatus { + + str := metaProbeStatusMap[types] + + if len(str) <= 0 { + return nil + } + return &MetaProbeStatus{ + Id:json.Number(strconv.Itoa(types)), + Name:str, + } +} diff --git a/proxy/noauthprobe/noauth_probe_service.go b/proxy/noauthprobe/noauth_probe_service.go index c611c37..c88b048 100644 --- a/proxy/noauthprobe/noauth_probe_service.go +++ b/proxy/noauthprobe/noauth_probe_service.go @@ -49,6 +49,7 @@ func NewNoAuthProbe(apikey string, ipAddress int64, hostName string, md int64) * IpAddress:ipAddress, HostName:hostName, MacAddress:md, + Status:meta.NewMetaNoAuthProbeStatus(meta.NOAUTH_PROBE_STATUS_PROCESS), } return na } @@ -56,7 +57,7 @@ func NewNoAuthProbe(apikey string, ipAddress int64, hostName string, md int64) * func(as *NoAuthProbeService)Save(na *NoAuthProbe) (string, error) { - out, err := utils.InvokeDBByModel("noauthProbe", "save", na, "com.loafle.overflow.module.noauthprobe.model.NoAuthProbe") + out, err := utils.InvokeDBByModel("noauthProbe", "save", na, utils.MODEL_NOAUTHPROBE) if err != nil { return "", err @@ -81,7 +82,7 @@ func(as *NoAuthProbeService)CheckAuth(tempKey string) (string,error) { // //out, err := proxy.InvokeDB("noauthProbe", "findByTempKey", memMap); - out, err:= utils.InvokeDBByModel("noauthProbe","findByTempProbeKey",tempKey, "java.lang.String") + out, err:= utils.InvokeDBByModel("noauthProbe","findByTempProbeKey",tempKey, utils.MODEL_STRING) if err != nil { return "", err @@ -100,7 +101,7 @@ func(as *NoAuthProbeService)CheckAuth(tempKey string) (string,error) { func(as *NoAuthProbeService)GetList(d *domain.Domain) (string,error) { - out, err := utils.InvokeDBByModel("noauthProbe","findAllByDomain", d, "com.loafle.overflow.module.domain.model.Domain"); + out, err := utils.InvokeDBByModel("noauthProbe","findAllByDomain", d, utils.MODEL_DOMAIN); if err != nil { return "", err @@ -122,7 +123,7 @@ func (as *NoAuthProbeService)RequestAuth(np *NoAuthProbe, domainId int, desc str //paramMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes) //out, err := proxy.InvokeDB("noauthProbe", "update", paramMap) - out ,err := utils.InvokeDBByModel("noauthProbe","findByTempProbeKey", np.TempProbeKey, "java.lang.String"); + out ,err := utils.InvokeDBByModel("noauthProbe","findByTempProbeKey", np.TempProbeKey, utils.MODEL_STRING); if err != nil { return "", err @@ -157,7 +158,7 @@ func (as *NoAuthProbeService)Read(id string) (string, error){ //mm["id"] = id //out, err := proxy.InvokeDB("noauthProbe", "findOne", id, "java.lang.Long") - out,err :=utils.InvokeDBByModel("noauthProbe","findOne",id,"java.lang.Long") + out,err :=utils.InvokeDBByModel("noauthProbe","findOne",id,utils.MODEL_LONG) if err != nil { return "", err diff --git a/proxy/probe/probe_service.go b/proxy/probe/probe_service.go index 982f40f..07e698a 100644 --- a/proxy/probe/probe_service.go +++ b/proxy/probe/probe_service.go @@ -17,7 +17,7 @@ type ProbeService struct { type Probe struct { Id json.Number `json:"id,Number,omitempty"` - Status *meta.MetaNoAuthProbeStatus `json:"status,omitempty"` + Status *meta.MetaProbeStatus `json:"status,omitempty"` CreateDate timestamp.Timestamp `json:"createDate,omitempty"` LastPollingDate timestamp.Timestamp `json:"lastPollingDate,omitempty"` NextPollingDate timestamp.Timestamp `json:"nextPollingDate,omitempty"` @@ -34,7 +34,7 @@ func NewProbeService() *ProbeService { func NewProbe(probeKey string, encryptionKey string) *Probe { na := &Probe{ - Status:meta.NewMetaNoAuthProbeStatus(meta.PROBE_STATUS_PROCESS), + Status:meta.NewMetaProbeStatus(meta.PROBE_STATUS_INITIAL), ProbeKey:probeKey, EncryptionKey:encryptionKey, @@ -44,7 +44,7 @@ func NewProbe(probeKey string, encryptionKey string) *Probe { func (as *ProbeService) Save(p *Probe) (string, error) { - out, err := utils.InvokeDBByModel("probe", "save", p, "com.loafle.overflow.module.probe.model.Probe") + out, err := utils.InvokeDBByModel("probe", "save", p, utils.MODEL_PROBE) if err != nil { return "", err @@ -55,7 +55,7 @@ func (as *ProbeService) Save(p *Probe) (string, error) { func (as *ProbeService) GetList(d *domain.Domain) (string, error) { - out, err := utils.InvokeDBByModel("probe", "findAgentListByMemberId", d, "com.loafle.overflow.module.domain.model.Domain") + out, err := utils.InvokeDBByModel("probe", "findAllByDomain", d, utils.MODEL_DOMAIN) if err != nil { return "", err diff --git a/proxy/probe/probe_service_test.go b/proxy/probe/probe_service_test.go index bb7c935..ff91ab3 100644 --- a/proxy/probe/probe_service_test.go +++ b/proxy/probe/probe_service_test.go @@ -1,23 +1,33 @@ package probe import ( - "encoding/json" + "testing" - "git.loafle.net/overflow/overflow_service/proxy/member" + + "git.loafle.net/overflow/overflow_service/proxy/keystore" + "git.loafle.net/overflow/overflow_service/proxy/domain" + ) -//func TestSaveAgent(t *testing.T) { -// m := member.Member{} -// m.Id = json.Number("1") -// -// agt := NewAgent("test agent424", m) -// as := NewProbeService() -// -// res, err := as.SaveAgent(agt) -// if err != nil { -// t.Log(res) -// } -//} +func TestSaveProbe(t *testing.T) { + + + ks := keystore.NewKeyStoreSerivce() + + pks, _ := ks.CreateKey() + enks, _ := ks.CreateKey() + + ppp := NewProbe(pks, enks) + ppp.Domain = &domain.Domain{Id:"1"} + as := NewProbeService() + + res, err := as.Save(ppp) + if err != nil { + t.Log(res) + } + + +} // //func TestListAgent(t *testing.T) {