From 53b54bc26ee7cec79da12a07f5af0aa4e44c2206 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 29 六月 2019 10:05:08 +0800
Subject: [PATCH] test

---
 service/FaceSdkService.go |   30 +++++++++++-------------------
 1 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 64e5f6c..cf36b5b 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -19,6 +19,7 @@
 type FaceSdkService struct {
 	File *multipart.File
 	Id string
+	Result []*protomsg.ResultFaceExtCom
 }
 
 const (
@@ -115,38 +116,29 @@
 	}
 }
 
-func (s *FaceSdkService) GetFaceFea() (feas []*protomsg.ResultFaceExtCom,err error){
+func (s *FaceSdkService) GetFaceFea(){
 	var wg sync.WaitGroup
 	wg.Add(1)
-	ch := make(chan []*protomsg.ResultFaceExtCom,0)
-	go func() {
+	ticker := time.NewTicker(time.Second * 2)
+	go func(ticker *time.Ticker, s *FaceSdkService) {
+		defer ticker.Stop()
+		defer wg.Done()
+
 		for {
 			select {
-			case <-time.Tick(time.Second*5):
-				fmt.Println("鍊掕鏃剁粨鏉�")
-				ch <- nil
-				wg.Done()
+			case <-ticker.C:
+				fmt.Println("timeout!")
 				return
 			default:
 				if feas,ok := resultMap[s.Id];ok {
 					fmt.Println("faceFea got!!!")
-					ch <- feas
+					s.Result = feas
 					return
-				} else {
-					fmt.Println("灏氭湭鎷垮埌fea")
 				}
 			}
 		}
-	}()
-	fmt.Println("wa.Wait")
+	}(ticker, s)
 	wg.Wait()
-	fmt.Println("<-ch")
-	msg := <- ch
-	if msg != nil {
-		return msg,nil
-	} else {
-		return msg,errors.New("no fea")
-	}
 }
 
 func readTestImgFile() protomsg.Image{

--
Gitblit v1.8.0