feat: update configuration file for docker and remove dead code

Signed-off-by: Huaqiao Zhang <huaqiaoz@vmware.com>

internal/component/mqtt.go

@@ -16,48 +16,46 @@
 
 package component
 
-import (
-	"log"
-	"strconv"
+// "log"
+// "strconv"
 
-	MQTT "github.com/eclipse/paho.mqtt.golang"
-	"github.com/edgexfoundry/edgex-ui-go/internal/domain"
-)
+// MQTT "github.com/eclipse/paho.mqtt.golang"
+// "github.com/edgexfoundry/edgex-ui-go/internal/domain"
 
 const (
 	ClientIDPrefix = "edgex-go-"
 )
 
-var f MQTT.MessageHandler = func(client MQTT.Client, msg MQTT.Message) {
-	log.Printf("TOPIC: %s\n", msg.Topic())
-	WsClientSend(MqttTokenCache, msg.Payload())
-}
-var MqttTokenCache string
-
-//{token:MqttClient}
-var ExportSubscriberCache = make(map[string]interface{}, 10)
-
-func CreateMqttClient(addressable domain.Addressable, token string) {
-	MqttTokenCache = token
-	broker := addressable.Protocol + "://" + addressable.Address + ":" + strconv.Itoa(addressable.Port)
-	opts := MQTT.NewClientOptions().AddBroker(broker)
-	opts.SetClientID(ClientIDPrefix + addressable.Topic)
-	opts.SetUsername(addressable.User)
-	opts.SetPassword(addressable.Password)
-
-	opts.OnConnect = func(c MQTT.Client) {
-		if t := c.Subscribe(addressable.Topic, 0, f); t.Wait() && t.Error() != nil {
-			panic(t.Error())
-		}
-	}
-
-	client := MQTT.NewClient(opts)
-
-	if t := client.Connect(); t.Wait() && t.Error() != nil {
-		panic(t.Error())
-	} else {
-		log.Println("Connected to mqtt server.")
-	}
-
-	ExportSubscriberCache[token+addressable.Topic] = client
-}
+// var f MQTT.MessageHandler = func(client MQTT.Client, msg MQTT.Message) {
+// 	log.Printf("TOPIC: %s\n", msg.Topic())
+// 	WsClientSend(MqttTokenCache, msg.Payload())
+// }
+// var MqttTokenCache string
+
+// //{token:MqttClient}
+// var ExportSubscriberCache = make(map[string]interface{}, 10)
+
+// func CreateMqttClient(addressable domain.Addressable, token string) {
+// 	MqttTokenCache = token
+// 	broker := addressable.Protocol + "://" + addressable.Address + ":" + strconv.Itoa(addressable.Port)
+// 	opts := MQTT.NewClientOptions().AddBroker(broker)
+// 	opts.SetClientID(ClientIDPrefix + addressable.Topic)
+// 	opts.SetUsername(addressable.User)
+// 	opts.SetPassword(addressable.Password)
+
+// 	opts.OnConnect = func(c MQTT.Client) {
+// 		if t := c.Subscribe(addressable.Topic, 0, f); t.Wait() && t.Error() != nil {
+// 			panic(t.Error())
+// 		}
+// 	}
+
+// 	client := MQTT.NewClient(opts)
+
+// 	if t := client.Connect(); t.Wait() && t.Error() != nil {
+// 		panic(t.Error())
+// 	} else {
+// 		log.Println("Connected to mqtt server.")
+// 	}
+
+// 	ExportSubscriberCache[token+addressable.Topic] = client
+// }

internal/component/websocket.go

@@ -16,53 +16,51 @@
 
 package component
 
-import (
-	"log"
-	"net/http"
-	"net/url"
+// "log"
+// "net/http"
+// "net/url"
 
-	"github.com/edgexfoundry/edgex-ui-go/internal/core"
-	"github.com/gorilla/websocket"
-)
+// "github.com/edgexfoundry/edgex-ui-go/internal/core"
+// "github.com/gorilla/websocket"
 
 const (
 	ReadBufferSize  = 1024
 	WriteBufferSize = 1024
 )
 
-type WsClientConn struct {
-	clientmapping map[string]*websocket.Conn
-}
+// type WsClientConn struct {
+// 	clientmapping map[string]*websocket.Conn
+// }
 
-var wsConn *WsClientConn
+// var wsConn *WsClientConn
 
-var upgrader = websocket.Upgrader{
-	ReadBufferSize:  ReadBufferSize,
-	WriteBufferSize: WriteBufferSize,
-}
+// var upgrader = websocket.Upgrader{
+// 	ReadBufferSize:  ReadBufferSize,
+// 	WriteBufferSize: WriteBufferSize,
+// }
 
-func WebSocketHandler(w http.ResponseWriter, r *http.Request) {
+// func WebSocketHandler(w http.ResponseWriter, r *http.Request) {
 
-	ws, _ := upgrader.Upgrade(w, r, nil)
-	if wsConn == nil {
-		wsConn = &WsClientConn{clientmapping: make(map[string]*websocket.Conn, 50)}
-	}
+// 	ws, _ := upgrader.Upgrade(w, r, nil)
+// 	if wsConn == nil {
+// 		wsConn = &WsClientConn{clientmapping: make(map[string]*websocket.Conn, 50)}
+// 	}
 
-	u := r.URL.RawQuery
-	m, _ := url.ParseQuery(u)
-	token := m[core.SessionTokenKey][0]
+// 	u := r.URL.RawQuery
+// 	m, _ := url.ParseQuery(u)
+// 	token := m[core.SessionTokenKey][0]
 
-	wsConn.clientmapping[token] = ws
-	log.Println("ws token:" + token)
-	log.Printf(" %d ws client connected success!", len(wsConn.clientmapping))
-}
+// 	wsConn.clientmapping[token] = ws
+// 	log.Println("ws token:" + token)
+// 	log.Printf(" %d ws client connected success!", len(wsConn.clientmapping))
+// }
 
-func WsClientSend(token string, message []byte) {
-	for k, v := range wsConn.clientmapping {
-		if k == token {
-			if v != nil {
-				v.WriteMessage(1, message)
-			}
-		}
-	}
-}
+// func WsClientSend(token string, message []byte) {
+// 	for k, v := range wsConn.clientmapping {
+// 		if k == token {
+// 			if v != nil {
+// 				v.WriteMessage(1, message)
+// 			}
+// 		}
+// 	}
+// }