Merge branch 'master' of https://git.loafle.net/overflow/overflow_proxy_service

# Conflicts:
#	proxy/sensorItem/sensorItem.go

proxy/sensor/sensor_test.go

@@ -1 +1,18 @@
 package sensor
+
+import (
+	"encoding/json"
+	"git.loafle.net/overflow/overflow_proxy_service/proxy/target"
+	"testing"
+)
+
+func TestSensorService_List(t *testing.T) {
+
+	ts := &target.Target{}
+	ts.Id = json.Number("1")
+
+	ss := NewSensorService()
+	res, _ := ss.List(ts)
+
+	t.Log(res)
+}

proxy/sensorItem/sensorItem.go

@@ -2,13 +2,10 @@ package sensorItem
 
 import (
 	"encoding/json"
-
-	//"git.loafle.net/overflow/overflow_proxy_service/proxy/sensorItemCategory"
-	"git.loafle.net/overflow/overflow_proxy_service/proxy/utils"
-
+	"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/commons_go/model/timestamp"
+	"git.loafle.net/overflow/overflow_proxy_service/proxy/utils"
 )
 
 type SensorItem struct {

proxy/sensorItem/sensorItem_test.go

@@ -1 +1,18 @@
 package sensorItem
+
+import (
+	"encoding/json"
+	"git.loafle.net/overflow/overflow_proxy_service/proxy/crawler"
+	"testing"
+)
+
+func TestSensorItemService_List(t *testing.T) {
+
+	cr := &crawler.Crawler{}
+	cr.Id = json.Number("1")
+	sis := NewSensorItemService()
+
+	res, _ := sis.List(cr)
+
+	t.Log(res)
+}

proxy/sensorItemMapping/sensorItemMapping_test.go

@@ -1 +1,17 @@
 package sensorItemMapping
+
+import (
+	"encoding/json"
+	"git.loafle.net/overflow/overflow_proxy_service/proxy/sensor"
+	"testing"
+)
+
+func TestSensorItemMappingService_List(t *testing.T) {
+	s := &sensor.Sensor{}
+	s.Id = json.Number("1")
+
+	sims := NewSensorItemMappingService()
+	res, _ := sims.List(s)
+
+	t.Log(res)
+}