|
@@ -1,6 +1,7 @@
|
|
|
package initialize
|
|
|
|
|
|
import (
|
|
|
+ "AIT/exception/errmsg"
|
|
|
"AIT/service"
|
|
|
"encoding/json"
|
|
|
"fmt"
|
|
@@ -31,6 +32,7 @@ type Message struct {
|
|
|
Recipient string `json:"recipient,omitempty"`
|
|
|
Content string `json:"content,omitempty"`
|
|
|
RecordId string `json:"recordId,omitempty"`
|
|
|
+ Status bool `json:"status,omitempty"`
|
|
|
}
|
|
|
|
|
|
// Manager define a ws server manager
|
|
@@ -80,7 +82,14 @@ func (manager *ClientManager) Start() {
|
|
|
//更新record
|
|
|
recordService := GetRecord()
|
|
|
if MessageStruct.RecordId != "" {
|
|
|
- recordService.UpdateRecordById(MessageStruct.RecordId, MessageStruct.Content)
|
|
|
+
|
|
|
+ content := ""
|
|
|
+ if MessageStruct.Status {
|
|
|
+ content = errmsg.TestResultSuccess + MessageStruct.Content
|
|
|
+ } else {
|
|
|
+ content = errmsg.TestResultFailed + MessageStruct.Content
|
|
|
+ }
|
|
|
+ recordService.UpdateRecordById(MessageStruct.RecordId, content)
|
|
|
}
|
|
|
|
|
|
} else {
|
|
@@ -107,7 +116,7 @@ func (c *Client) Read() {
|
|
|
Manager.Unregister <- c
|
|
|
err := c.Socket.Close()
|
|
|
if err != nil {
|
|
|
- fmt.Println("socket close error:" + err.Error())
|
|
|
+ fmt.Println(errmsg.SocketCloseError + err.Error())
|
|
|
return
|
|
|
}
|
|
|
}()
|
|
@@ -119,6 +128,7 @@ func (c *Client) Read() {
|
|
|
Manager.Unregister <- c
|
|
|
err := c.Socket.Close()
|
|
|
if err != nil {
|
|
|
+ fmt.Println(errmsg.SocketCloseError + err.Error())
|
|
|
return
|
|
|
}
|
|
|
break
|
|
@@ -132,7 +142,7 @@ func (c *Client) Write() {
|
|
|
defer func() {
|
|
|
err := c.Socket.Close()
|
|
|
if err != nil {
|
|
|
- fmt.Println("socket close error:" + err.Error())
|
|
|
+ fmt.Println(errmsg.SocketCloseError + err.Error())
|
|
|
return
|
|
|
}
|
|
|
}()
|