diff --git a/gateway/service_test.go b/gateway/service_test.go index 2dd4d58..61d9093 100644 --- a/gateway/service_test.go +++ b/gateway/service_test.go @@ -8,8 +8,8 @@ import ( "github.com/golang/glog" "fmt" - "git.loafle.net/overflow/overflow_proxy_service/proxy/member" - "git.loafle.net/overflow/overflow_proxy_service/proxy/target" + "git.loafle.net/overflow/overflow_service/proxy/member" + "git.loafle.net/overflow/overflow_service/proxy/target" ) func TestServices(t *testing.T) { diff --git a/glide.yaml b/glide.yaml index cab1894..34bd0dc 100644 --- a/glide.yaml +++ b/glide.yaml @@ -6,9 +6,9 @@ import: vcs: git subpackages: - grpc -- package: git.loafle.net/overflow/overflow_proxy_service +- package: git.loafle.net/overflow/overflow_service version: master - repo: https://git.loafle.net/overflow/overflow_proxy_service.git + repo: https://git.loafle.net/overflow/overflow_service.git vcs: git subpackages: - proxy/member diff --git a/gwrpc_main.go b/gwrpc_main.go index c8ab611..95f8305 100644 --- a/gwrpc_main.go +++ b/gwrpc_main.go @@ -3,7 +3,7 @@ package main import ( "flag" "github.com/golang/glog" - "git.loafle.net/overflow/overflow_gateway_service/server" + "git.loafle.net/overflow/overflow_service/server" ) diff --git a/proxy/agent/agent_service.go b/proxy/agent/agent_service.go index 54a1667..1587d12 100644 --- a/proxy/agent/agent_service.go +++ b/proxy/agent/agent_service.go @@ -3,9 +3,9 @@ package agent import ( "encoding/json" //"fmt" - //"git.loafle.net/overflow/overflow_proxy_service/proxy" - "git.loafle.net/overflow/overflow_proxy_service/proxy/member" - "git.loafle.net/overflow/overflow_proxy_service/proxy/utils" + //"git.loafle.net/overflow/overflow_service/proxy" + "git.loafle.net/overflow/overflow_service/proxy/member" + "git.loafle.net/overflow/overflow_service/proxy/utils" "time" ) diff --git a/proxy/agent/agent_service_test.go b/proxy/agent/agent_service_test.go index ebef91c..a49834e 100644 --- a/proxy/agent/agent_service_test.go +++ b/proxy/agent/agent_service_test.go @@ -3,7 +3,7 @@ package agent import ( "encoding/json" "testing" - "git.loafle.net/overflow/overflow_proxy_service/proxy/member" + "git.loafle.net/overflow/overflow_service/proxy/member" ) func TestSaveAgent(t *testing.T) { diff --git a/proxy/apikey/apikey_service.go b/proxy/apikey/apikey_service.go index 72f4c2f..eea7294 100644 --- a/proxy/apikey/apikey_service.go +++ b/proxy/apikey/apikey_service.go @@ -3,9 +3,9 @@ package apikey import ( "encoding/json" "git.loafle.net/overflow/commons_go/model/timestamp" - //"git.loafle.net/overflow/overflow_proxy_service/proxy" + //"git.loafle.net/overflow/overflow_service/proxy" //"log" - "git.loafle.net/overflow/overflow_proxy_service/proxy/utils" + "git.loafle.net/overflow/overflow_service/proxy/utils" ) type ApiKeyService struct { diff --git a/proxy/crawler/crawler_service.go b/proxy/crawler/crawler_service.go index 1594654..cf36dd9 100644 --- a/proxy/crawler/crawler_service.go +++ b/proxy/crawler/crawler_service.go @@ -3,8 +3,8 @@ package crawler 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" + //"git.loafle.net/overflow/overflow_service/proxy" + "git.loafle.net/overflow/overflow_service/proxy/utils" ) type CrawlerService struct { diff --git a/proxy/crawlerInputItem/crawlerinputitem_service.go b/proxy/crawlerInputItem/crawlerinputitem_service.go index a9315b0..ec24971 100644 --- a/proxy/crawlerInputItem/crawlerinputitem_service.go +++ b/proxy/crawlerInputItem/crawlerinputitem_service.go @@ -3,7 +3,7 @@ package crawlerInputItem import ( "git.loafle.net/overflow/commons_go/model/timestamp" "encoding/json" - "git.loafle.net/overflow/overflow_proxy_service/proxy/utils" + "git.loafle.net/overflow/overflow_service/proxy/utils" ) type CrawlerInputItem struct { diff --git a/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go b/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go index b764019..801f20f 100644 --- a/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go +++ b/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go @@ -3,9 +3,9 @@ package crawlerinputitemmapping import ( "git.loafle.net/overflow/commons_go/model/timestamp" "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" + "git.loafle.net/overflow/overflow_service/proxy/crawler" + "git.loafle.net/overflow/overflow_service/proxy/crawlerInputItem" + "git.loafle.net/overflow/overflow_service/proxy/utils" ) type CrawlerInputItemMapping struct { diff --git a/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service_test.go b/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service_test.go index 4e29148..2022dc6 100644 --- a/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service_test.go +++ b/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service_test.go @@ -3,7 +3,7 @@ package crawlerinputitemmapping import ( "testing" - "git.loafle.net/overflow/overflow_proxy_service/proxy/crawler" + "git.loafle.net/overflow/overflow_service/proxy/crawler" ) func TestListCrawler(t *testing.T) { diff --git a/proxy/email/email_service.go b/proxy/email/email_service.go index 5f47438..313314d 100644 --- a/proxy/email/email_service.go +++ b/proxy/email/email_service.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" "git.loafle.net/overflow/commons_go/model/timestamp" - "git.loafle.net/overflow/overflow_proxy_service/proxy" - "git.loafle.net/overflow/overflow_proxy_service/proxy/member" + "git.loafle.net/overflow/overflow_service/proxy" + "git.loafle.net/overflow/overflow_service/proxy/member" "github.com/google/uuid" "log" "net" diff --git a/proxy/email/email_service_test.go b/proxy/email/email_service_test.go index 3039afe..ece3358 100644 --- a/proxy/email/email_service_test.go +++ b/proxy/email/email_service_test.go @@ -3,7 +3,7 @@ package email import ( "testing" "fmt" - "git.loafle.net/overflow/overflow_proxy_service/proxy/member" + "git.loafle.net/overflow/overflow_service/proxy/member" "encoding/json" ) diff --git a/proxy/member/member_service.go b/proxy/member/member_service.go index b34127a..83902ee 100644 --- a/proxy/member/member_service.go +++ b/proxy/member/member_service.go @@ -2,10 +2,10 @@ package member import ( "encoding/json" - "git.loafle.net/overflow/overflow_proxy_service/proxy" + "git.loafle.net/overflow/overflow_service/proxy" "log" - "git.loafle.net/overflow/overflow_proxy_service/proxy/apikey" - "git.loafle.net/overflow/overflow_proxy_service/proxy/keystore" + "git.loafle.net/overflow/overflow_service/proxy/apikey" + "git.loafle.net/overflow/overflow_service/proxy/keystore" "git.loafle.net/overflow/encryption_go" "errors" ) diff --git a/proxy/member/member_service_test.go b/proxy/member/member_service_test.go index dfdebfd..b549ccb 100644 --- a/proxy/member/member_service_test.go +++ b/proxy/member/member_service_test.go @@ -6,7 +6,7 @@ import ( "github.com/golang/glog" "fmt" "log" - "git.loafle.net/overflow/overflow_proxy_service/proxy" + "git.loafle.net/overflow/overflow_service/proxy" ) diff --git a/proxy/noauthagent/noauth_agent_service.go b/proxy/noauthagent/noauth_agent_service.go index 9a74036..51682e9 100644 --- a/proxy/noauthagent/noauth_agent_service.go +++ b/proxy/noauthagent/noauth_agent_service.go @@ -3,10 +3,10 @@ package noauthagent import ( "git.loafle.net/overflow/commons_go/model/timestamp" - "git.loafle.net/overflow/overflow_proxy_service/proxy" + "git.loafle.net/overflow/overflow_service/proxy" "encoding/json" - "git.loafle.net/overflow/overflow_proxy_service/proxy/member" - "git.loafle.net/overflow/overflow_proxy_service/proxy/agent" + "git.loafle.net/overflow/overflow_service/proxy/member" + "git.loafle.net/overflow/overflow_service/proxy/agent" "errors" ) diff --git a/proxy/sensor/sensor.go b/proxy/sensor/sensor.go index 3e7ee5f..c401297 100644 --- a/proxy/sensor/sensor.go +++ b/proxy/sensor/sensor.go @@ -3,9 +3,9 @@ package sensor import ( "encoding/json" "git.loafle.net/overflow/commons_go/model/timestamp" - "git.loafle.net/overflow/overflow_proxy_service/proxy/target" - "git.loafle.net/overflow/overflow_proxy_service/proxy/utils" - "git.loafle.net/overflow/overflow_proxy_service/proxy/crawler" + "git.loafle.net/overflow/overflow_service/proxy/target" + "git.loafle.net/overflow/overflow_service/proxy/utils" + "git.loafle.net/overflow/overflow_service/proxy/crawler" ) type Sensor struct { diff --git a/proxy/sensor/sensor_test.go b/proxy/sensor/sensor_test.go index 637393f..c46bd79 100644 --- a/proxy/sensor/sensor_test.go +++ b/proxy/sensor/sensor_test.go @@ -2,7 +2,7 @@ package sensor import ( "encoding/json" - "git.loafle.net/overflow/overflow_proxy_service/proxy/target" + "git.loafle.net/overflow/overflow_service/proxy/target" "testing" ) diff --git a/proxy/sensorItem/sensorItem.go b/proxy/sensorItem/sensorItem.go index c77f302..85890c3 100644 --- a/proxy/sensorItem/sensorItem.go +++ b/proxy/sensorItem/sensorItem.go @@ -3,9 +3,9 @@ package sensorItem import ( "encoding/json" "git.loafle.net/overflow/commons_go/model/timestamp" - "git.loafle.net/overflow/overflow_proxy_service/proxy/crawler" - "git.loafle.net/overflow/overflow_proxy_service/proxy/sensorItemCategory" - "git.loafle.net/overflow/overflow_proxy_service/proxy/utils" + "git.loafle.net/overflow/overflow_service/proxy/crawler" + "git.loafle.net/overflow/overflow_service/proxy/sensorItemCategory" + "git.loafle.net/overflow/overflow_service/proxy/utils" ) type SensorItem struct { diff --git a/proxy/sensorItem/sensorItem_test.go b/proxy/sensorItem/sensorItem_test.go index ce46512..7405662 100644 --- a/proxy/sensorItem/sensorItem_test.go +++ b/proxy/sensorItem/sensorItem_test.go @@ -2,7 +2,7 @@ package sensorItem import ( "encoding/json" - "git.loafle.net/overflow/overflow_proxy_service/proxy/crawler" + "git.loafle.net/overflow/overflow_service/proxy/crawler" "testing" ) diff --git a/proxy/sensorItemCategory/sensorItemCategory.go b/proxy/sensorItemCategory/sensorItemCategory.go index ac3621c..304b588 100644 --- a/proxy/sensorItemCategory/sensorItemCategory.go +++ b/proxy/sensorItemCategory/sensorItemCategory.go @@ -3,7 +3,7 @@ package sensorItemCategory import ( "encoding/json" "git.loafle.net/overflow/commons_go/model/timestamp" - "git.loafle.net/overflow/overflow_proxy_service/proxy/utils" + "git.loafle.net/overflow/overflow_service/proxy/utils" ) type SensorItemCategory struct { diff --git a/proxy/sensorItemMapping/sensorItemMapping.go b/proxy/sensorItemMapping/sensorItemMapping.go index e9171e8..53f6095 100644 --- a/proxy/sensorItemMapping/sensorItemMapping.go +++ b/proxy/sensorItemMapping/sensorItemMapping.go @@ -3,9 +3,9 @@ package sensorItemMapping import ( "encoding/json" "git.loafle.net/overflow/commons_go/model/timestamp" - "git.loafle.net/overflow/overflow_proxy_service/proxy/sensor" - "git.loafle.net/overflow/overflow_proxy_service/proxy/sensorItem" - "git.loafle.net/overflow/overflow_proxy_service/proxy/utils" + "git.loafle.net/overflow/overflow_service/proxy/sensor" + "git.loafle.net/overflow/overflow_service/proxy/sensorItem" + "git.loafle.net/overflow/overflow_service/proxy/utils" ) type SensorItemMapping struct { diff --git a/proxy/sensorItemMapping/sensorItemMapping_test.go b/proxy/sensorItemMapping/sensorItemMapping_test.go index 4a95ae5..d548ef2 100644 --- a/proxy/sensorItemMapping/sensorItemMapping_test.go +++ b/proxy/sensorItemMapping/sensorItemMapping_test.go @@ -2,7 +2,7 @@ package sensorItemMapping import ( "encoding/json" - "git.loafle.net/overflow/overflow_proxy_service/proxy/sensor" + "git.loafle.net/overflow/overflow_service/proxy/sensor" "testing" "fmt" "sync" diff --git a/proxy/session/session.go b/proxy/session/session.go index 0ee4d65..a765a2c 100644 --- a/proxy/session/session.go +++ b/proxy/session/session.go @@ -1,6 +1,6 @@ package session -import "git.loafle.net/overflow/overflow_proxy_service/proxy/member" +import "git.loafle.net/overflow/overflow_service/proxy/member" //FIXME:: test session member func GetSessionMember() *member.Member { diff --git a/proxy/target/target_service.go b/proxy/target/target_service.go index 2073896..bb31e21 100644 --- a/proxy/target/target_service.go +++ b/proxy/target/target_service.go @@ -3,12 +3,12 @@ package target import ( "encoding/json" "git.loafle.net/overflow/commons_go/model/timestamp" - "git.loafle.net/overflow/overflow_proxy_service/proxy/member" - "git.loafle.net/overflow/overflow_proxy_service/proxy" + "git.loafle.net/overflow/overflow_service/proxy/member" + "git.loafle.net/overflow/overflow_service/proxy" "fmt" - "git.loafle.net/overflow/overflow_proxy_service/proxy/utils" - "git.loafle.net/overflow/overflow_proxy_service/proxy/session" + "git.loafle.net/overflow/overflow_service/proxy/utils" + "git.loafle.net/overflow/overflow_service/proxy/session" ) type Target struct { diff --git a/proxy/target/target_service_test.go b/proxy/target/target_service_test.go index a2df2f3..1a37a4b 100644 --- a/proxy/target/target_service_test.go +++ b/proxy/target/target_service_test.go @@ -2,10 +2,10 @@ package target import ( "testing" - //"git.loafle.net/overflow/overflow_proxy_service/proxy/member" + //"git.loafle.net/overflow/overflow_service/proxy/member" - "git.loafle.net/overflow/overflow_proxy_service/proxy/member" + "git.loafle.net/overflow/overflow_service/proxy/member" ) diff --git a/proxy/utils/DBInvokeUtil.go b/proxy/utils/DBInvokeUtil.go index d015a37..0d86e1e 100644 --- a/proxy/utils/DBInvokeUtil.go +++ b/proxy/utils/DBInvokeUtil.go @@ -2,7 +2,7 @@ package utils import ( "encoding/json" - "git.loafle.net/overflow/overflow_proxy_service/proxy" + "git.loafle.net/overflow/overflow_service/proxy" ) func InvokeDB( db string, method string, obj interface{}) (string, error) { diff --git a/rpc_main.go b/rpc_main.go index c49abee..36f8bc2 100644 --- a/rpc_main.go +++ b/rpc_main.go @@ -1,10 +1,10 @@ package main import ( - "git.loafle.net/overflow/overflow_gateway_service/gateway" + "git.loafle.net/overflow/overflow_service/gateway" "flag" "github.com/golang/glog" - "git.loafle.net/overflow/overflow_gateway_service/server" + "git.loafle.net/overflow/overflow_service/server" ) diff --git a/server/rpc.go b/server/rpc.go index 33fd6fa..a58f5c1 100644 --- a/server/rpc.go +++ b/server/rpc.go @@ -4,7 +4,7 @@ import ( "net" "google.golang.org/grpc" pb "git.loafle.net/overflow/overflow_api_service/grpc" - "git.loafle.net/overflow/overflow_gateway_service/gateway" + "git.loafle.net/overflow/overflow_service/gateway" ) func RunRpc() error {