add refresh token to resp

liuxiaolong

2020-06-05 7c811247ecf143e08c576986a884bedadc57dd66

 service/FaceSdkService.go

@@ -2,86 +2,74 @@

import (
   "basic.com/pubsub/protomsg.git"
   "basic.com/valib/deliver.git"
   "encoding/json"
   "fmt"
   "basic.com/valib/godraw.git"
   "basic.com/valib/logger.git"
   "bytes"
   "github.com/gogo/protobuf/proto"
   "github.com/satori/go.uuid"
   "io/ioutil"
   "image"
   "time"
)

type FaceSdkService struct {
   File []byte
   Id int64
   Result []*protomsg.ResultFaceDetect
   DeadTime time.Duration
}

const (
   Url_Service_PUSH = "tcp:///tmp///webserver_2.ipc"
   Url_Service_PULL = "tcp:///tmp///webserver_1.ipc"
   faceExtractWebCID = "virtual-face-extract-web-camera-id"
)
var imgPushChan chan protomsg.Recvmsg

func TestPushImgMsg() {
   InitService()
   imgData := readImgFile()
   fmt.Println("imgData.len:",len(imgData))
   for {
      PushImgMsg(protomsg.Recvmsg{
         Id:uuid.NewV4().String(),
         Addr:"",
         Picdata:imgData,
      })
      fmt.Println("pushed img")
      time.Sleep(5*time.Second)
func GetFaceFeaFromSdk(fileBytes []byte,deadTime time.Duration) ([]*protomsg.ResultFaceDetect,error,*protomsg.Image){
   t1 := time.Now()
   s := newFaceSdkService(fileBytes, deadTime)
   i, err := s.readFromUploadImg()
   logger.Debug("ReadFromUploadImg用时:", time.Since(t1))
   if err !=nil{
      logger.Debug("readFromUploadImg err:",err)
      return nil,err,i
   }
}

func readImgFile() []byte{
   filePath := "/home/user/workspace/timg.jpg"
   bytes, err := ioutil.ReadFile(filePath)
   imgBytes, err := proto.Marshal(i)
   if err !=nil {
      fmt.Println("Read img err:",err)
      logger.Debug("i marshal err:",err)
      return nil,err,i
   }
   return bytes
   detectResults, err := DoFDetectWithRpc(&protomsg.FaceDetectRequest{ReqParam: imgBytes}, deadTime)
   logger.Debug("提取face共用时：", time.Since(t1))
   if err !=nil {
      logger.Debug("DoFDetectWithRpc err:",err)
      return nil,err,i
   } else {
      return detectResults,nil,i
   }
}

func PushImgMsg(is protomsg.Recvmsg){
   imgPushChan <- is
func newFaceSdkService(fileBytes []byte, deadTime time.Duration) *FaceSdkService{
   return &FaceSdkService{
      File:fileBytes,
      Id:time.Now().UnixNano(),
      DeadTime:deadTime,
   }
}

var resultMap map[string]protomsg.SdkMessage
func (s *FaceSdkService) readFromUploadImg() (*protomsg.Image,error){
   bt := bytes.NewBuffer(s.File)
   img, _, err := image.Decode(bt)
   if err != nil {
      return nil, err
   }
   bgr := godraw.Image2BGR(img)

   timeUnix := time.Now().Unix()
   formatTimeStr := time.Unix(timeUnix, 0).Format("2006-01-02 15:04:05")

func InitService(){
   fmt.Println("service init!")
   imgPushChan = make(chan protomsg.Recvmsg)
   client_push := deliver.NewClient(deliver.PushPull, Url_Service_PUSH)
   client_pull := deliver.NewClient(deliver.PushPull, Url_Service_PULL)

   go func() {
      for {
         select {
         case is := <- imgPushChan:
            fmt.Println("imgPushChan in")
            b, _ := json.Marshal(is)
            client_push.Send(b)
         default:
            //fmt.Println("no img in")
         }
      }
   }()

   go func() {
      //接收人脸提取结果
      for {
         resultBytes, err := client_pull.Recv()
         if err !=nil{
            fmt.Println("pull err:",err)
            continue
         }
         rMsg := protomsg.SdkMessage{}
         if err := proto.Unmarshal(resultBytes, &rMsg);err !=nil{
            fmt.Println("recv MSG:",rMsg)
            resultMap[rMsg.Cid] = rMsg
         }

      }
   }()

}
   return &protomsg.Image{
      Width: int32(img.Bounds().Dx()),
      Height: int32(img.Bounds().Dy()),
      Timestamp: formatTimeStr,
      Data: bgr,
      Id: s.Id,
      Cid: faceExtractWebCID,
   },nil
}