From 0aeac2c1fbee885079402f21c042e8771e07c780 Mon Sep 17 00:00:00 2001 From: snoop Date: Thu, 8 Jun 2017 17:34:21 +0900 Subject: [PATCH] added util crawlers --- proxy/crawler/crawler_service.go | 11 +++----- .../crawlerinputitem_service.go | 16 ++++++++++++ .../crawlerinputitemmapping_service.go | 14 +++++++++++ proxy/service.go | 10 +------- proxy/session/session.go | 12 +++++++++ proxy/target/target_service.go | 25 +++++++++++++------ proxy/utils/DBInvokeUtil.go | 23 +++++++++++++++++ 7 files changed, 87 insertions(+), 24 deletions(-) create mode 100644 proxy/session/session.go create mode 100644 proxy/utils/DBInvokeUtil.go diff --git a/proxy/crawler/crawler_service.go b/proxy/crawler/crawler_service.go index 8370497..bb30378 100644 --- a/proxy/crawler/crawler_service.go +++ b/proxy/crawler/crawler_service.go @@ -4,6 +4,7 @@ import ( "encoding/json" "git.loafle.net/overflow/commons_go/model/timestamp" "git.loafle.net/overflow/overflow_proxy_service/proxy" + "git.loafle.net/overflow/overflow_proxy_service/proxy/utils" ) type CrawlerService struct { @@ -39,17 +40,13 @@ func (c *CrawlerService)List() string { func (c *CrawlerService)Create(ct * Crawler) string { - bytes, err := json.Marshal(ct) + + out, err := utils.InvokeDB("crawler", "create", ct, "") + if err != nil { return "" } - m := make(map[string]string) - - m[""] = string(bytes) - - out := proxy.InvokeDB("crawler", "create", m) - return out; } diff --git a/proxy/crawlerInputItem/crawlerinputitem_service.go b/proxy/crawlerInputItem/crawlerinputitem_service.go index 2334224..26baf5c 100644 --- a/proxy/crawlerInputItem/crawlerinputitem_service.go +++ b/proxy/crawlerInputItem/crawlerinputitem_service.go @@ -3,6 +3,7 @@ package crawlerInputItem import ( "git.loafle.net/overflow/commons_go/model/timestamp" "encoding/json" + "git.loafle.net/overflow/overflow_proxy_service/proxy/utils" ) type CrawlerInputItem struct { @@ -18,4 +19,19 @@ type CrawlerInputItemSerivce struct { func NewCrawlerInputItemService() *CrawlerInputItemSerivce { return &CrawlerInputItemSerivce{} +} + + + +func (c *CrawlerInputItemSerivce)Create(cii * CrawlerInputItem) string { + + out, err := utils.InvokeDB("crawlerInputItem", "create", cii, "") + + if err != nil { + return "" + } + + + return out; + } \ No newline at end of file diff --git a/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go b/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go index 1856cf0..7a3da30 100644 --- a/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go +++ b/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go @@ -5,6 +5,7 @@ import ( "encoding/json" "git.loafle.net/overflow/overflow_proxy_service/proxy/crawler" "git.loafle.net/overflow/overflow_proxy_service/proxy/crawlerInputItem" + "git.loafle.net/overflow/overflow_proxy_service/proxy/utils" ) type CrawlerInputItemMapping struct { @@ -23,4 +24,17 @@ type CrawlerInputItemMappingService struct { func NewCrawlerInputItemMappingService() *CrawlerInputItemMappingService { return &CrawlerInputItemMappingService{} +} + +func (c *CrawlerInputItemMappingService)Create(ciim *CrawlerInputItemMapping) string { + + out, err := utils.InvokeDB("crawlerInputItemMapping", "create", ciim, "") + + if err != nil { + return "" + } + + + return out; + } \ No newline at end of file diff --git a/proxy/service.go b/proxy/service.go index a267fd3..fc4acab 100644 --- a/proxy/service.go +++ b/proxy/service.go @@ -5,7 +5,7 @@ import ( pb "git.loafle.net/overflow/overflow_api_db/build/golang" "google.golang.org/grpc" "golang.org/x/net/context" - "git.loafle.net/overflow/overflow_proxy_service/proxy/member" + ) @@ -33,11 +33,3 @@ func InvokeDB(targetDb, methodName string, param map[string]string) (string) { return out.Result } -//FIXME:: test session member -func GetSessionMember() *member.Member { - - m := member.NewMember() - m.Id = "1"; - - return m; -} \ No newline at end of file diff --git a/proxy/session/session.go b/proxy/session/session.go new file mode 100644 index 0000000..0ee4d65 --- /dev/null +++ b/proxy/session/session.go @@ -0,0 +1,12 @@ +package session + +import "git.loafle.net/overflow/overflow_proxy_service/proxy/member" + +//FIXME:: test session member +func GetSessionMember() *member.Member { + + m := member.NewMember() + m.Id = "1"; + + return m; +} \ No newline at end of file diff --git a/proxy/target/target_service.go b/proxy/target/target_service.go index 4119390..3318426 100644 --- a/proxy/target/target_service.go +++ b/proxy/target/target_service.go @@ -7,6 +7,8 @@ import ( "git.loafle.net/overflow/overflow_proxy_service/proxy" "fmt" + "git.loafle.net/overflow/overflow_proxy_service/proxy/utils" + "git.loafle.net/overflow/overflow_proxy_service/proxy/session" ) type Target struct { @@ -37,7 +39,7 @@ func (t *TargetService)GetModel() interface{} { func (t *TargetService)List(tm *Target) string { - tm.Member.Id = proxy.GetSessionMember().Id + tm.Member.Id = session.GetSessionMember().Id bytes, err := json.Marshal(tm) @@ -56,19 +58,26 @@ func (t *TargetService)List(tm *Target) string { func (t *TargetService)Create(tm *Target) string { - bytes, err := json.Marshal(tm) + //bytes, err := json.Marshal(tm) + // + //if err != nil { + // return "" + //} + // + //m := make(map[string]string) + //m["com.loafle.overflow.target.model.Target"] = string(bytes) + // + //out := proxy.InvokeDB("target", "create", m) + + out, err := utils.InvokeDB("target", "create", tm, "com.loafle.overflow.target.model.Target") if err != nil { return "" } - m := make(map[string]string) - m["com.loafle.overflow.target.model.Target"] = string(bytes) - - out := proxy.InvokeDB("target", "create", m) - return out; + } func (t *TargetService)CreateAll(tmlist *[]*Target) string { @@ -78,7 +87,7 @@ func (t *TargetService)CreateAll(tmlist *[]*Target) string { outlist := make([]string, 0) for _, ttt := range *tmlist { - ttt.Member = proxy.GetSessionMember() + ttt.Member = session.GetSessionMember() out := t.Create(ttt) outlist = append(outlist, out) } diff --git a/proxy/utils/DBInvokeUtil.go b/proxy/utils/DBInvokeUtil.go new file mode 100644 index 0000000..d19d71d --- /dev/null +++ b/proxy/utils/DBInvokeUtil.go @@ -0,0 +1,23 @@ +package utils + +import ( + "encoding/json" + "git.loafle.net/overflow/overflow_proxy_service/proxy" +) + +func InvokeDB( db string, method string, obj interface{}, model string) (string, error) { + + bytes, err := json.Marshal(obj) + if err != nil { + return "", err + } + + m := make(map[string]string) + + m[model] = string(bytes) + + out := proxy.InvokeDB(db, method, m) + + + return out, nil +} \ No newline at end of file