From d43878b50039b6d5c7732746b4f8a6a82a838eca Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 28 六月 2019 20:54:10 +0800
Subject: [PATCH] test
---
controllers/fileController.go | 8 +++++++-
service/FaceSdkService.go | 16 +++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 6ff8fa5..1afb2b9 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -4,6 +4,7 @@
"basic.com/pubsub/protomsg.git"
"bytes"
"encoding/base64"
+ "errors"
"fmt"
"github.com/gin-gonic/gin"
"github.com/satori/go.uuid"
@@ -196,7 +197,12 @@
return nil,err
}
s.PushImgMsg(bc)
- return s.GetFaceFea()
+ s.GetFaceFea()
+ if s.Result == nil{
+ return nil,errors.New("no fea")
+ } else {
+ return s.Result,nil
+ }
}
/**涓婁紶鏂规硶**/
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 64e5f6c..5e280cb 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,22 +116,21 @@
}
}
-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() {
for {
select {
- case <-time.Tick(time.Second*5):
+ case <-time.Tick(time.Second*2):
fmt.Println("鍊掕鏃剁粨鏉�")
- ch <- nil
wg.Done()
return
default:
if feas,ok := resultMap[s.Id];ok {
fmt.Println("faceFea got!!!")
- ch <- feas
+ s.Result = feas
return
} else {
fmt.Println("灏氭湭鎷垮埌fea")
@@ -141,12 +141,6 @@
fmt.Println("wa.Wait")
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