From 1f54c37e3cd9dcb56539643134bd6d6672fb2832 Mon Sep 17 00:00:00 2001 From: snoop Date: Fri, 23 Jun 2017 17:42:52 +0900 Subject: [PATCH] changed pacaget agent -> probe --- gateway/services.go | 10 +++++----- .../noauth_probe_service.go} | 16 ++++++++-------- .../noauth_probe_service_test.go} | 2 +- .../agent_service.go => probe/probe_service.go} | 16 ++++++++-------- .../probe_service_test.go} | 2 +- proxy/utils/DBInvokeUtil.go | 1 + 6 files changed, 24 insertions(+), 23 deletions(-) rename proxy/{noauthagent/noauth_agent_service.go => noauthprobe/noauth_probe_service.go} (86%) rename proxy/{noauthagent/noauth_agent_service_test.go => noauthprobe/noauth_probe_service_test.go} (98%) rename proxy/{agent/agent_service.go => probe/probe_service.go} (81%) rename proxy/{agent/agent_service_test.go => probe/probe_service_test.go} (97%) diff --git a/gateway/services.go b/gateway/services.go index 1b2f88a..c907502 100644 --- a/gateway/services.go +++ b/gateway/services.go @@ -9,7 +9,7 @@ import ( "errors" "log" - "git.loafle.net/overflow/overflow_service/proxy/noauthagent" + "git.loafle.net/overflow/overflow_service/proxy/noauthprobe" "git.loafle.net/overflow/overflow_service/proxy/target" "git.loafle.net/overflow/overflow_service/proxy/member" "git.loafle.net/overflow/overflow_service/proxy/crawler" @@ -19,7 +19,7 @@ import ( "git.loafle.net/overflow/overflow_service/proxy/sensorItem" "git.loafle.net/overflow/overflow_service/proxy/sensorItemCategory" "git.loafle.net/overflow/overflow_service/proxy/sensorItemMapping" - "git.loafle.net/overflow/overflow_service/proxy/agent" + "git.loafle.net/overflow/overflow_service/proxy/probe" //"google.golang.org/grpc/metadata" ) @@ -42,10 +42,10 @@ func InitServices() { g_services = make(map[string]interface{},0) // proxy services save - //AddServices("Agent", agent.NewAgentService()) + //AddServices("Agent", probe.NewAgentService()) AddServices("Member", member.NewMemberService()) - AddServices("NoAuthAgent", noauthagent.NewNoAuthAgentService()) - AddServices("Agent", agent.NewAgentService()) + AddServices("NoAuthAgent", noauthprobe.NewNoAuthAgentService()) + AddServices("Agent", probe.NewAgentService()) AddServices("Target", target.NewTargetService()) AddServices("Crawler", crawler.NewCrawlerService()) AddServices("CrawlerInputItem", crawlerInputItem.NewCrawlerInputItemService()) diff --git a/proxy/noauthagent/noauth_agent_service.go b/proxy/noauthprobe/noauth_probe_service.go similarity index 86% rename from proxy/noauthagent/noauth_agent_service.go rename to proxy/noauthprobe/noauth_probe_service.go index 51682e9..93c90d2 100644 --- a/proxy/noauthagent/noauth_agent_service.go +++ b/proxy/noauthprobe/noauth_probe_service.go @@ -1,4 +1,4 @@ -package noauthagent +package noauthprobe import ( @@ -6,7 +6,7 @@ import ( "git.loafle.net/overflow/overflow_service/proxy" "encoding/json" "git.loafle.net/overflow/overflow_service/proxy/member" - "git.loafle.net/overflow/overflow_service/proxy/agent" + "git.loafle.net/overflow/overflow_service/proxy/probe" "errors" ) @@ -50,7 +50,7 @@ func(as *NoAuthAgentService)SaveNoAuthAgent(na *NoAuthAgent) (string, error) { } memMap := make(map[string]string) - memMap["com.loafle.overflow.noauthagent.model.NoAuthAgent"] = string(bytes); + memMap["com.loafle.overflow.noauthprobe.model.NoAuthAgent"] = string(bytes); out, err := proxy.InvokeDB("noauthAgent", "create", memMap); @@ -73,7 +73,7 @@ func(as *NoAuthAgentService)CheckAuth(tempKey string) (string,error) { return "", err; } - memMap["com.loafle.overflow.noauthagent.model.NoAuthAgent"] = string(bytes); + memMap["com.loafle.overflow.noauthprobe.model.NoAuthAgent"] = string(bytes); out, err := proxy.InvokeDB("noauthAgent", "findByTempKey", memMap); @@ -104,7 +104,7 @@ func(as *NoAuthAgentService)GetNoAuthList(excludeStatus string) (string,error) { return "", err; } - memMap["com.loafle.overflow.noauthagent.model.NoAuthAgent"] = string(bytes); + memMap["com.loafle.overflow.noauthprobe.model.NoAuthAgent"] = string(bytes); out, err := proxy.InvokeDB("noauthAgent", "findAllByNoAuth", memMap); @@ -126,7 +126,7 @@ func (as *NoAuthAgentService)RequestAuth(noauthAgt NoAuthAgent, memberId, desc s if err != nil { return "", err; } - paramMap["com.loafle.overflow.noauthagent.model.NoAuthAgent"] = string(bytes) + paramMap["com.loafle.overflow.noauthprobe.model.NoAuthAgent"] = string(bytes) out, err := proxy.InvokeDB("noauthAgent", "update", paramMap) if err != nil { @@ -138,8 +138,8 @@ func (as *NoAuthAgentService)RequestAuth(noauthAgt NoAuthAgent, memberId, desc s } m := member.Member{} m.Id = json.Number(memberId) - newAgent := agent.NewAgent(desc, m) - newone, err := agent.NewAgentService().SaveAgent(newAgent) + newAgent := probe.NewAgent(desc, m) + newone, err := probe.NewAgentService().SaveAgent(newAgent) if err!= nil { return "", err } diff --git a/proxy/noauthagent/noauth_agent_service_test.go b/proxy/noauthprobe/noauth_probe_service_test.go similarity index 98% rename from proxy/noauthagent/noauth_agent_service_test.go rename to proxy/noauthprobe/noauth_probe_service_test.go index 248ed14..3c7771d 100644 --- a/proxy/noauthagent/noauth_agent_service_test.go +++ b/proxy/noauthprobe/noauth_probe_service_test.go @@ -1,4 +1,4 @@ -package noauthagent +package noauthprobe import ( diff --git a/proxy/agent/agent_service.go b/proxy/probe/probe_service.go similarity index 81% rename from proxy/agent/agent_service.go rename to proxy/probe/probe_service.go index 1587d12..7b7c78f 100644 --- a/proxy/agent/agent_service.go +++ b/proxy/probe/probe_service.go @@ -1,4 +1,4 @@ -package agent +package probe import ( "encoding/json" @@ -36,18 +36,18 @@ func NewAgent(desc string, member member.Member) *Agent { } func (as *AgentService) SaveAgent(agent *Agent) (string, error) { - //bytes, err := json.Marshal(agent) + //bytes, err := json.Marshal(probe) //if err != nil { // return "", err //} - //fmt.Println(agent.Member.Id) + //fmt.Println(probe.Member.Id) //fmt.Println(string(bytes)) //paramMap := make(map[string]string) - //paramMap["com.loafle.overflow.agent.model.Agent"] = string(bytes) + //paramMap["com.loafle.overflow.probe.model.Agent"] = string(bytes) // - //out, err := proxy.InvokeDB("agent", "create", paramMap) + //out, err := proxy.InvokeDB("probe", "create", paramMap) - out, err := utils.InvokeDB("agent", "create", agent) + out, err := utils.InvokeDB("probe", "create", agent) if err != nil { return "", err @@ -69,9 +69,9 @@ func (as *AgentService) GetAgentList(mem *member.Member) (string, error) { // //paramMap["com.loafle.overflow.member.model.Member"] = string(bytes) // - //out, err := proxy.InvokeDB("agent", "findAgentListByMemberId", paramMap) + //out, err := proxy.InvokeDB("probe", "findAgentListByMemberId", paramMap) - out, err := utils.InvokeDBByModel("agent", "findAgentListByMemberId", mem, "com.loafle.overflow.member.model.Member") + out, err := utils.InvokeDBByModel("probe", "findAgentListByMemberId", mem, "com.loafle.overflow.member.model.Member") if err != nil { return "", err diff --git a/proxy/agent/agent_service_test.go b/proxy/probe/probe_service_test.go similarity index 97% rename from proxy/agent/agent_service_test.go rename to proxy/probe/probe_service_test.go index a49834e..1beef35 100644 --- a/proxy/agent/agent_service_test.go +++ b/proxy/probe/probe_service_test.go @@ -1,4 +1,4 @@ -package agent +package probe import ( "encoding/json" diff --git a/proxy/utils/DBInvokeUtil.go b/proxy/utils/DBInvokeUtil.go index 0d86e1e..3a130ee 100644 --- a/proxy/utils/DBInvokeUtil.go +++ b/proxy/utils/DBInvokeUtil.go @@ -5,6 +5,7 @@ import ( "git.loafle.net/overflow/overflow_service/proxy" ) +// Deprecated: package rule changed...T__T func InvokeDB( db string, method string, obj interface{}) (string, error) { var m map[string]string = nil;