From d5513b461112be7a7531ebb4565d29a4c8fa8a4d Mon Sep 17 00:00:00 2001 From: snoop Date: Mon, 26 Jun 2017 14:37:44 +0900 Subject: [PATCH] added setting --- proxy/keystore/keystore_service.go | 7 ++- proxy/keystore/keystore_service_test.go | 7 +-- proxy/meta/meta_noauth_probe_status.go | 31 +++++++++- proxy/meta/meta_probe_status.go | 15 +++++ proxy/noauthprobe/noauth_probe_service.go | 12 ++-- .../noauthprobe/noauth_probe_service_test.go | 2 +- proxy/probe/probe_service.go | 60 +++++++------------ proxy/probe/probe_service_test.go | 48 +++++++-------- proxy/utils/model_mapping.go | 10 ++++ 9 files changed, 114 insertions(+), 78 deletions(-) create mode 100644 proxy/meta/meta_probe_status.go create mode 100644 proxy/utils/model_mapping.go diff --git a/proxy/keystore/keystore_service.go b/proxy/keystore/keystore_service.go index 747171b..a4d4d89 100644 --- a/proxy/keystore/keystore_service.go +++ b/proxy/keystore/keystore_service.go @@ -2,6 +2,7 @@ package keystore import ( "github.com/google/uuid" + "strings" ) type KeyStoreService struct { @@ -14,11 +15,13 @@ func NewKeyStoreSerivce() *KeyStoreService { } func(k *KeyStoreService)CreateKey() (string,error) { - uu, err := uuid.NewUUID(); + uu, err := uuid.NewUUID() if err != nil { return "", err } - return uu.String(), nil + ss := strings.Replace(uu.String(), "-", "", -1) + + return ss, nil } diff --git a/proxy/keystore/keystore_service_test.go b/proxy/keystore/keystore_service_test.go index d3f6edf..19caae8 100644 --- a/proxy/keystore/keystore_service_test.go +++ b/proxy/keystore/keystore_service_test.go @@ -2,7 +2,7 @@ package keystore import ( "testing" - "strings" + ) func TestGetKey(t *testing.T) { @@ -14,10 +14,5 @@ func TestGetKey(t *testing.T) { t.Log(str) t.Log(len(str)) - ss := strings.Replace(str, "-", "", -1) - - - t.Log(ss); - t.Log(len(ss)) } \ No newline at end of file diff --git a/proxy/meta/meta_noauth_probe_status.go b/proxy/meta/meta_noauth_probe_status.go index 0e69bec..5867117 100644 --- a/proxy/meta/meta_noauth_probe_status.go +++ b/proxy/meta/meta_noauth_probe_status.go @@ -1,8 +1,37 @@ package meta -import "encoding/json" +import ( + "encoding/json" + "strconv" +) + +const ( + PROBE_STATUS_ACCEPT = 1 + PROBE_STATUS_DENY = 2 + PROBE_STATUS_PROCESS = 3 +) + +var metaNoauthProbeStatusMap = map[int]string{ + 1: "ACCEPT", + 2: "DENY", + 3: "PROCESS", +} type MetaNoAuthProbeStatus struct { Id json.Number `json:"id,Number,omitempty"` Name string `json:"name,omitempty"` +} + +func NewMetaNoAuthProbeStatus(types int) *MetaNoAuthProbeStatus { + + str := metaNoauthProbeStatusMap[types] + + if len(str) <= 0 { + return nil + } + + return &MetaNoAuthProbeStatus{ + Id:json.Number(strconv.Itoa(types)), + Name:str, + } } \ No newline at end of file diff --git a/proxy/meta/meta_probe_status.go b/proxy/meta/meta_probe_status.go new file mode 100644 index 0000000..0d9bdcb --- /dev/null +++ b/proxy/meta/meta_probe_status.go @@ -0,0 +1,15 @@ +package meta + +import "encoding/json" + +const ( + INITIAL = 1 + NORMAL = 2 +) + +type MetaProbeStatus struct { + Id json.Number `json:"id,Number,omitempty"` + Name string `json:"name,omitempty"` +} + + diff --git a/proxy/noauthprobe/noauth_probe_service.go b/proxy/noauthprobe/noauth_probe_service.go index ec4522e..c611c37 100644 --- a/proxy/noauthprobe/noauth_probe_service.go +++ b/proxy/noauthprobe/noauth_probe_service.go @@ -5,7 +5,7 @@ import ( "git.loafle.net/overflow/commons_go/model/timestamp" "encoding/json" - "git.loafle.net/overflow/overflow_service/proxy/member" + "git.loafle.net/overflow/overflow_service/proxy/probe" "git.loafle.net/overflow/overflow_service/proxy/domain" "errors" @@ -111,7 +111,7 @@ func(as *NoAuthProbeService)GetList(d *domain.Domain) (string,error) { -func (as *NoAuthProbeService)RequestAuth(np *NoAuthProbe, memberId int, desc string) (string, error) { +func (as *NoAuthProbeService)RequestAuth(np *NoAuthProbe, domainId int, desc string) (string, error) { //paramMap := make(map[string]string) //noauthAgt.Status = "A" // @@ -141,10 +141,10 @@ func (as *NoAuthProbeService)RequestAuth(np *NoAuthProbe, memberId int, desc str //FIXME:: probe - m := member.Member{} - m.Id = json.Number(memberId) - newAgent := probe.NewAgent(desc, m) - newone, err := probe.NewProbeService().SaveAgent(newAgent) + d := domain.Domain{} + d.Id = json.Number(domainId) + newAgent := probe.NewProbe("", "") + newone, err := probe.NewProbeService().Save(newAgent) if err!= nil { return "", err } diff --git a/proxy/noauthprobe/noauth_probe_service_test.go b/proxy/noauthprobe/noauth_probe_service_test.go index 5c10cb8..0a1673c 100644 --- a/proxy/noauthprobe/noauth_probe_service_test.go +++ b/proxy/noauthprobe/noauth_probe_service_test.go @@ -128,4 +128,4 @@ func TestRead(t *testing.T) { t.Log(out) -} \ No newline at end of file +} diff --git a/proxy/probe/probe_service.go b/proxy/probe/probe_service.go index 6112a68..982f40f 100644 --- a/proxy/probe/probe_service.go +++ b/proxy/probe/probe_service.go @@ -4,9 +4,12 @@ import ( "encoding/json" //"fmt" //"git.loafle.net/overflow/overflow_service/proxy" - "git.loafle.net/overflow/overflow_service/proxy/member" + "git.loafle.net/overflow/overflow_service/proxy/utils" - "time" + + "git.loafle.net/overflow/overflow_service/proxy/meta" + "git.loafle.net/overflow/commons_go/model/timestamp" + "git.loafle.net/overflow/overflow_service/proxy/domain" ) type ProbeService struct { @@ -14,40 +17,34 @@ type ProbeService struct { type Probe struct { Id json.Number `json:"id,Number,omitempty"` - AuthorizedDate int64 `json:"authorizedDate,Number,omitempty"` - Description string `json:"description,omitempty"` - Member member.Member `json:"member,omitempty"` - LastPollingDate int64 `json:"lastPollingDate,omitempty"` - Status string `json:"status,omitempty"` + Status *meta.MetaNoAuthProbeStatus `json:"status,omitempty"` + CreateDate timestamp.Timestamp `json:"createDate,omitempty"` + LastPollingDate timestamp.Timestamp `json:"lastPollingDate,omitempty"` + NextPollingDate timestamp.Timestamp `json:"nextPollingDate,omitempty"` + Domain *domain.Domain `json:"domain,omitempty"` + ProbeKey string `json:"probeKey,omitempty"` + EncryptionKey string `json:"encryptionKey,omitempty"` } + func NewProbeService() *ProbeService { return &ProbeService{} } -func NewAgent(desc string, member member.Member) *Probe { +func NewProbe(probeKey string, encryptionKey string) *Probe { na := &Probe{ - AuthorizedDate: time.Now().Unix(), - Description: desc, - Member: member, + Status:meta.NewMetaNoAuthProbeStatus(meta.PROBE_STATUS_PROCESS), + ProbeKey:probeKey, + EncryptionKey:encryptionKey, + } return na } -func (as *ProbeService) SaveAgent(agent *Probe) (string, error) { - //bytes, err := json.Marshal(probe) - //if err != nil { - // return "", err - //} - //fmt.Println(probe.Member.Id) - //fmt.Println(string(bytes)) - //paramMap := make(map[string]string) - //paramMap["com.loafle.overflow.probe.model.Probe"] = string(bytes) - // - //out, err := proxy.InvokeDB("probe", "create", paramMap) +func (as *ProbeService) Save(p *Probe) (string, error) { - out, err := utils.InvokeDB("probe", "create", agent) + out, err := utils.InvokeDBByModel("probe", "save", p, "com.loafle.overflow.module.probe.model.Probe") if err != nil { return "", err @@ -56,22 +53,9 @@ func (as *ProbeService) SaveAgent(agent *Probe) (string, error) { return out, nil } -func (as *ProbeService) GetAgentList(mem *member.Member) (string, error) { - //paramMap := make(map[string]string) - // - //mem := member.NewMember() - //mem.Id = json.Number(memberId) - // - //bytes, err := json.Marshal(mem) - //if err != nil { - // return "", err - //} - // - //paramMap["com.loafle.overflow.member.model.Member"] = string(bytes) - // - //out, err := proxy.InvokeDB("probe", "findAgentListByMemberId", paramMap) +func (as *ProbeService) GetList(d *domain.Domain) (string, error) { - out, err := utils.InvokeDBByModel("probe", "findAgentListByMemberId", mem, "com.loafle.overflow.member.model.Member") + out, err := utils.InvokeDBByModel("probe", "findAgentListByMemberId", d, "com.loafle.overflow.module.domain.model.Domain") if err != nil { return "", err diff --git a/proxy/probe/probe_service_test.go b/proxy/probe/probe_service_test.go index fdac4f4..bb7c935 100644 --- a/proxy/probe/probe_service_test.go +++ b/proxy/probe/probe_service_test.go @@ -6,28 +6,28 @@ import ( "git.loafle.net/overflow/overflow_service/proxy/member" ) -func TestSaveAgent(t *testing.T) { - m := member.Member{} - m.Id = json.Number("1") +//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) +// } +//} - agt := NewAgent("test agent424", m) - as := NewProbeService() - - res, err := as.SaveAgent(agt) - if err != nil { - t.Log(res) - } -} - - -func TestListAgent(t *testing.T) { - as := NewProbeService() - m := member.Member{} - m.Id = "1" - if res, err := as.getAgentList(&m); err != nil { - t.Fatal(err) - }else { - t.Log(res) - } - -} +// +//func TestListAgent(t *testing.T) { +// as := NewProbeService() +// m := member.Member{} +// m.Id = "1" +// if res, err := as.GetAgentList(&m); err != nil { +// t.Fatal(err) +// }else { +// t.Log(res) +// } +// +//} diff --git a/proxy/utils/model_mapping.go b/proxy/utils/model_mapping.go new file mode 100644 index 0000000..142de80 --- /dev/null +++ b/proxy/utils/model_mapping.go @@ -0,0 +1,10 @@ +package utils + + +const ( + MODEL_DOMAIN = "com.loafle.overflow.module.domain.model.Domain" + MODEL_NOAUTHPROBE = "com.loafle.overflow.module.noauthprobe.model.NoAuthProbe" + MODEL_PROBE = "com.loafle.overflow.module.probe.model.Probe" + MODEL_STRING = "java.lang.String" + MODEL_LONG = "java.lang.Long" +) \ No newline at end of file