overflow_backup_2018_0455/overflow_service
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed

Browse Source 
pacaget
      agent -> probe
This commit is contained in:
snoop 2017-06-23 17:54:12 +09:00
parent 1d37f87065
commit 74beb66775
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gateway/services.go
View File

@ -42,10 +42,10 @@ func InitServices() {
g_services = make(map[string]interface{},0) g_services = make(map[string]interface{},0)
// proxy services save // proxy services save
//AddServices("Probe", probe.NewAgentService()) //AddServices("Probe", probe.NewProbeService())
AddServices("Member", member.NewMemberService()) AddServices("Member", member.NewMemberService())
AddServices("NoAuthProbe", noauthprobe.NewNoAuthAgentService()) AddServices("NoAuthProbe", noauthprobe.NewNoAuthProbeService())
AddServices("Probe", probe.NewAgentService()) AddServices("Probe", probe.NewProbeService())
AddServices("Target", target.NewTargetService()) AddServices("Target", target.NewTargetService())
AddServices("Crawler", crawler.NewCrawlerService()) AddServices("Crawler", crawler.NewCrawlerService())
AddServices("CrawlerInputItem", crawlerInputItem.NewCrawlerInputItemService()) AddServices("CrawlerInputItem", crawlerInputItem.NewCrawlerInputItemService())

26
proxy/noauthprobe/noauth_probe_service.go
View File

@ -13,7 +13,7 @@ import (
type NoAuthProbeService struct { type NoAuthProbeService struct {
} }
func NewNoAuthAgentService() *NoAuthProbeService { func NewNoAuthProbeService() *NoAuthProbeService {
return &NoAuthProbeService{} return &NoAuthProbeService{}
} }
@ -29,7 +29,7 @@ type NoAuthProbe struct {
} }
func NewNoAuthAgent(apikey string, localIp int64, hostName string) *NoAuthProbe { func NewNoAuthProbe(apikey string, localIp int64, hostName string) *NoAuthProbe {
na := &NoAuthProbe{ na := &NoAuthProbe{
Date:timestamp.Now(), Date:timestamp.Now(),
@ -41,7 +41,7 @@ func NewNoAuthAgent(apikey string, localIp int64, hostName string) *NoAuthProbe
} }
func(as *NoAuthProbeService)SaveNoAuthAgent(na *NoAuthProbe) (string, error) { func(as *NoAuthProbeService)Save(na *NoAuthProbe) (string, error) {
bytes, err := json.Marshal(na) bytes, err := json.Marshal(na)
@ -52,7 +52,7 @@ func(as *NoAuthProbeService)SaveNoAuthAgent(na *NoAuthProbe) (string, error) {
memMap := make(map[string]string) memMap := make(map[string]string)
memMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes); memMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes);
out, err := proxy.InvokeDB("noauthAgent", "create", memMap); out, err := proxy.InvokeDB("noauthProbe", "create", memMap);
if err != nil { if err != nil {
return "", err return "", err
@ -65,7 +65,7 @@ func(as *NoAuthProbeService)CheckAuth(tempKey string) (string,error) {
memMap := make(map[string]string) memMap := make(map[string]string)
na := NewNoAuthAgent("", 0, "") na := NewNoAuthProbe("", 0, "")
na.TempKey = tempKey na.TempKey = tempKey
bytes, err := json.Marshal(na) bytes, err := json.Marshal(na)
@ -75,7 +75,7 @@ func(as *NoAuthProbeService)CheckAuth(tempKey string) (string,error) {
memMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes); memMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes);
out, err := proxy.InvokeDB("noauthAgent", "findByTempKey", memMap); out, err := proxy.InvokeDB("noauthProbe", "findByTempKey", memMap);
if err != nil { if err != nil {
return "", err return "", err
@ -92,11 +92,11 @@ func(as *NoAuthProbeService)CheckAuth(tempKey string) (string,error) {
} }
func(as *NoAuthProbeService)GetNoAuthList(excludeStatus string) (string,error) { func(as *NoAuthProbeService)GetList(excludeStatus string) (string,error) {
memMap := make(map[string]string) memMap := make(map[string]string)
na := NewNoAuthAgent("", 0, "") na := NewNoAuthProbe("", 0, "")
na.AuthStatus = excludeStatus na.AuthStatus = excludeStatus
bytes, err := json.Marshal(na) bytes, err := json.Marshal(na)
@ -106,7 +106,7 @@ func(as *NoAuthProbeService)GetNoAuthList(excludeStatus string) (string,error) {
memMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes); memMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes);
out, err := proxy.InvokeDB("noauthAgent", "findAllByNoAuth", memMap); out, err := proxy.InvokeDB("noauthProbe", "findAllByNoAuth", memMap);
if err != nil { if err != nil {
return "", err return "", err
@ -127,7 +127,7 @@ func (as *NoAuthProbeService)RequestAuth(noauthAgt NoAuthProbe, memberId, desc s
return "", err; return "", err;
} }
paramMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes) paramMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes)
out, err := proxy.InvokeDB("noauthAgent", "update", paramMap) out, err := proxy.InvokeDB("noauthProbe", "update", paramMap)
if err != nil { if err != nil {
return "", err return "", err
@ -139,7 +139,7 @@ func (as *NoAuthProbeService)RequestAuth(noauthAgt NoAuthProbe, memberId, desc s
m := member.Member{} m := member.Member{}
m.Id = json.Number(memberId) m.Id = json.Number(memberId)
newAgent := probe.NewAgent(desc, m) newAgent := probe.NewAgent(desc, m)
newone, err := probe.NewAgentService().SaveAgent(newAgent) newone, err := probe.NewProbeService().SaveAgent(newAgent)
if err!= nil { if err!= nil {
return "", err return "", err
} }
@ -147,10 +147,10 @@ func (as *NoAuthProbeService)RequestAuth(noauthAgt NoAuthProbe, memberId, desc s
return newone, nil return newone, nil
} }
func (as *NoAuthProbeService)ReadNoAuthAgent(id string) (string, error){ func (as *NoAuthProbeService)Read(id string) (string, error){
mm := make(map[string]string) mm := make(map[string]string)
mm["id"] = id mm["id"] = id
out, err := proxy.InvokeDB("noauthAgent", "find", mm) out, err := proxy.InvokeDB("noauthProbe", "find", mm)
if err != nil { if err != nil {
return "", err return "", err

20
proxy/noauthprobe/noauth_probe_service_test.go
View File

@ -23,14 +23,14 @@ func TestCreateUUid(t *testing.T) {
func TestCreateNoAuthAgent(t *testing.T) { func TestCreateNoAuthAgent(t *testing.T) {
na := NewNoAuthAgent("233421390283", 111, "Snoop") na := NewNoAuthProbe("233421390283", 111, "Snoop")
na.TempKey = "1111111" na.TempKey = "1111111"
na.AuthStatus = "WAIT" na.AuthStatus = "WAIT"
nas := NewNoAuthAgentService() nas := NewNoAuthProbeService()
out, err := nas.SaveNoAuthAgent(na) out, err := nas.Save(na)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -42,12 +42,12 @@ func TestCreateNoAuthAgent(t *testing.T) {
func TestCheckAuthNoAuthAgent(t *testing.T) { func TestCheckAuthNoAuthAgent(t *testing.T) {
na := NewNoAuthAgent("2334278390283", 111, "Snoop") na := NewNoAuthProbe("2334278390283", 111, "Snoop")
na.TempKey = "alsdkjf;alkdjsf;la" na.TempKey = "alsdkjf;alkdjsf;la"
na.AuthStatus = "WAIT" na.AuthStatus = "WAIT"
nas := NewNoAuthAgentService() nas := NewNoAuthProbeService()
out, err := nas.CheckAuth(na.TempKey) out, err := nas.CheckAuth(na.TempKey)
@ -63,9 +63,9 @@ func TestCheckAuthNoAuthAgent(t *testing.T) {
func TestNoAuthList(t *testing.T) { func TestNoAuthList(t *testing.T) {
nas := NewNoAuthAgentService() nas := NewNoAuthProbeService()
out, err := nas.GetNoAuthList("ACCEPT") out, err := nas.GetList("ACCEPT")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -76,8 +76,8 @@ func TestNoAuthList(t *testing.T) {
} }
func TestRequestAuth(t *testing.T) { func TestRequestAuth(t *testing.T) {
nas := NewNoAuthAgentService() nas := NewNoAuthProbeService()
res, err := nas.ReadNoAuthAgent("1") res, err := nas.Read("1")
na := NoAuthProbe{} na := NoAuthProbe{}
json.Unmarshal([]byte(res), na) json.Unmarshal([]byte(res), na)
@ -93,7 +93,7 @@ func TestRequestAuth(t *testing.T) {
func TestCheckAuth(t *testing.T) { func TestCheckAuth(t *testing.T) {
ns := NewNoAuthAgentService() ns := NewNoAuthProbeService()
str, err := ns.CheckAuth("3398473-90847903874") str, err := ns.CheckAuth("3398473-90847903874")
if err != nil { if err != nil {

2
proxy/probe/probe_service.go
View File

@ -21,7 +21,7 @@ type Probe struct {
Status string `json:"status,omitempty"` Status string `json:"status,omitempty"`
} }
func NewAgentService() *ProbeService { func NewProbeService() *ProbeService {
return &ProbeService{} return &ProbeService{}
} }

4
proxy/probe/probe_service_test.go
View File

@ -11,7 +11,7 @@ func TestSaveAgent(t *testing.T) {
m.Id = json.Number("1") m.Id = json.Number("1")
agt := NewAgent("test agent424", m) agt := NewAgent("test agent424", m)
as := NewAgentService() as := NewProbeService()
res, err := as.SaveAgent(agt) res, err := as.SaveAgent(agt)
if err != nil { if err != nil {
@ -21,7 +21,7 @@ func TestSaveAgent(t *testing.T) {
func TestListAgent(t *testing.T) { func TestListAgent(t *testing.T) {
as := NewAgentService() as := NewProbeService()
m := member.Member{} m := member.Member{}
m.Id = "1" m.Id = "1"
if res, err := as.getAgentList(&m); err != nil { if res, err := as.getAgentList(&m); err != nil {