5
0

2 Revīzijas f38bc5aa22 ... 77b5f7d296

Autors SHA1 Ziņojums Datums
  xuchl 77b5f7d296 Merge branch 'dev' of http://code.dashoo.cn/dashoo/genepoint_service into dev 4 gadi atpakaļ
  xuchl 7fd8aed20b 心跳信息不对 4 gadi atpakaļ

+ 1 - 0
src/dashoo.cn/genepoint_srv/business/converseService/converseService.go

@@ -79,6 +79,7 @@ func (this *ConverseService) GetRequestEntity(request string, utc string, data R
 // key的信息按照生物样本存储系统分配的私钥字符串+请求报文中的time字段的值进行MD5加密
 func (this *ConverseService) GetKeyBaseOnTime(utc string) string {
 	privateKey, _ := utils.Cfg.GetValue("key", "privateKey")
+	log.Println("身份验证Key",privateKey)
 	//privateKey := "ZGlzdHJp23Yn4V06b3I6OGQ5NjllZWY2ZWNhZDNjMjlhM2E2MjkyODBlNjg2Y2YwYzNmNWQ1YTg2YWZmM2Nh3MTIwMjB3454jOTIzYWRjNmM5M4g"
 	unencoded := privateKey + utc
 	byte := md5.Sum([]byte(unencoded))

+ 9 - 9
src/dashoo.cn/genepoint_srv/main.go

@@ -56,6 +56,9 @@ var heartTimeOut = 10 * time.Second
 // 初始心跳时间
 var heartTime = time.Now()
 
+// 初始心跳计时器
+var pingTimer = time.NewTicker(10 * time.Second)
+
 func main() {
 	temp = false
 
@@ -113,6 +116,7 @@ func main() {
 			//return
 		case <-disconnect:
 			log.Println("服务器连接已断开!")
+			pingTimer = time.NewTicker(10 * time.Second)
 			connectWebSocket()
 
 			// for {
@@ -372,9 +376,6 @@ func initGpServiceUrl() {
 func echo() {
 	// 设置心跳处理
 	wsConn.SetPongHandler(
-		/*func(message string) error {
-		log.Println("pong received:", message)
-		return err*/
 		func(message string) error {
 			log.Println("pong received", message)
 
@@ -385,7 +386,6 @@ func echo() {
 
 	go func() {
 		// 设定ping
-		pingTimer := time.NewTicker(10 * time.Second)
 		for {
 			select {
 			case <-pingTimer.C:
@@ -399,17 +399,17 @@ func echo() {
 			}
 		}
 	}()
-	for {
-		mt, message, err := wsConn.ReadMessage()
+	/*for {
+		_, _, err := wsConn.ReadMessage()
 		if err != nil {
 			log.Println("read:", err)
 			break
 		}
-		// log.Printf("recv: %s", message)
-		err = wsConn.WriteMessage(mt, message)
+		log.Printf("recv: %s", message)
+		err = wsConn.WriteMessage(mt,[]byte("Do ping"))
 		if err != nil {
 			log.Println("write:", err)
 			break
 		}
-	}
+	}*/
 }