From 725d54ef5f16ede9c39cb003ed9d474edf02c0e5 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 30 八月 2019 13:58:25 +0800
Subject: [PATCH] add facedetect grpc

---
 service/FaceSdkService.go |   37 +++++++++++++++++++++++++------------
 1 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index ca7f185..9547060 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -43,23 +43,36 @@
 		logger.Debug("readFromUploadImg err:",err)
 		return nil,err,i
 	}
-	bc, err := ImgCompress(i)
-	logger.Debug("ImgCompress鐢ㄦ椂:", time.Since(t1))
-	t1 = time.Now()
+	imgBytes, err := proto.Marshal(i)
 	if err !=nil {
-		logger.Debug("ImgCompress err:",err)
+		logger.Debug("i marshal err:",err)
 		return nil,err,i
 	}
-	s.PushImgMsg(bc)
-	logger.Debug("PushImgMsg鐢ㄦ椂:", time.Since(t1))
-	t1 = time.Now()
-	s.GetFaceFea()
-	logger.Debug("GetFaceFea鐢ㄦ椂:", time.Since(t1))
-	if s.Result == nil{
-		return nil,errors.New("no fea"),i
+	detectResults, err := DoFDetectWithRpc(&protomsg.FaceDetectRequest{ReqParam: imgBytes}, deadTime)
+	if err !=nil {
+		logger.Debug("DoFDetectWithRpc err:",err)
+		return nil,err,i
 	} else {
-		return s.Result,nil,i
+		return detectResults,nil,i
 	}
+
+	//bc, err := ImgCompress(i)
+	//logger.Debug("ImgCompress鐢ㄦ椂:", time.Since(t1))
+	//t1 = time.Now()
+	//if err !=nil {
+	//	logger.Debug("ImgCompress err:",err)
+	//	return nil,err,i
+	//}
+	//s.PushImgMsg(bc)
+	//logger.Debug("PushImgMsg鐢ㄦ椂:", time.Since(t1))
+	//t1 = time.Now()
+	//s.GetFaceFea()
+	//logger.Debug("GetFaceFea鐢ㄦ椂:", time.Since(t1))
+	//if s.Result == nil{
+	//	return nil,errors.New("no fea"),i
+	//} else {
+	//	return s.Result,nil,i
+	//}
 }
 
 func NewFaceSdkService(fileBytes []byte, deadTime time.Duration) FaceSdkService{

--
Gitblit v1.8.0