Merge branch 'badboy-huaqiao-pick-to-edinburgh' into edinburgh

.gitignore

@@ -4,7 +4,7 @@ vendor
 go.sum
 *.DS_Store
 cmd/edgex-ui-server/edgex-ui-server
-
 *.snap
 prime/
-squashfs-root/
\ No newline at end of file
+squashfs-root/
+coverage.out
\ No newline at end of file

Makefile

@@ -31,7 +31,7 @@ clean:
 	rm -f $(MICROSERVICES)
 
 test:
-	GO111MODULE=on go test -cover ./...
+	GO111MODULE=on go test -coverprofile=coverage.out ./...
 	GO111MODULE=on go vet ./...
 
 prepare:

app/component/websocket.go

@@ -21,7 +21,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/edgexfoundry-holding/edgex-ui-go/configs"
+	"github.com/edgexfoundry/edgex-ui-go/app/common"
 	"github.com/gorilla/websocket"
 )
 
@@ -50,7 +50,7 @@ func WebSocketHandler(w http.ResponseWriter, r *http.Request) {
 
 	u := r.URL.RawQuery
 	m, _ := url.ParseQuery(u)
-	token := m[configs.SessionTokenKey][0]
+	token := m[common.SessionTokenKey][0]
 
 	wsConn.clientmapping[token] = ws
 	log.Println("ws token:" + token)

go.mod

 module github.com/edgexfoundry/edgex-ui-go
 
-go 1.12
+go 1.11
 
 require (
 	github.com/BurntSushi/toml v0.3.1