From 9bb6f2ddbdcc3c06799dd7beb2e19861f982d9d4 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 09 七月 2019 11:13:51 +0800
Subject: [PATCH] 给配置文件对应的结构体配上yaml的序列化
---
main.go | 107 +++++++++++++++++++++++++++--------------------------
1 files changed, 54 insertions(+), 53 deletions(-)
diff --git a/main.go b/main.go
index 74008a7..3661898 100644
--- a/main.go
+++ b/main.go
@@ -8,16 +8,16 @@
"bytes"
"flag"
"fmt"
+ "ruleprocess/logger"
"github.com/golang/protobuf/proto"
"gocv.io/x/gocv"
"image"
"image/color"
"os"
"ruleprocess/cache"
- "ruleprocess/insertdata"
"ruleprocess/ruleserver"
"ruleprocess/util"
- "ruleprocess/logger"
+ "ruleprocess/insertdata"
"sync"
)
var dbIp = flag.String("dbIp","127.0.0.1","dbserver ip")
@@ -33,11 +33,12 @@
logger.Config(logFile, logger.DebugLevel)
logger.SetSaveDays(logSaveDays)
logger.Info("loginit success !")
+
}
func main() {
flag.Parse()
wg := sync.WaitGroup{}
- wg.Add(1)
+ wg.Add(2)
dbapi.Init(*dbIp,*dbPort)
go cache.Init(initchan,*dbIp,*surveyPort,*pubPort)
@@ -187,7 +188,7 @@
}
logger.Info("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅浜鸿劯妫�娴嬩腑鏈夊嚑涓洰鏍囷細",len(faceParam.Faces))
for _, info := range faceParam.Faces {
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality)*100, IsYolo:false,ThftRes:*(info.Result)}
+ photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality)*100, IsYolo:false,ThftRes:*(info.Result),Feature:info.Feats}
arg.Photo = append(arg.Photo, photoMap)
}
args.Sdkdata = append(args.Sdkdata,&arg)
@@ -195,55 +196,55 @@
continue
}
}
- if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
- arg := ruleserver.SdkData{}
- arg.TaskId = m.Tasklab.Taskid
- arg.SdkId = sdkinfo.Sdkid
- arg.SdkName = sdkinfo.SdkName
- arg.IsYolo = false
- bdata, err := util.UnCompress(m.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- arg.ImageWidth = int(i.Width)
- arg.ImageHeight = int(i.Height)
- // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
- arg.KeepRight = false
- arg.IsStatic = false
- if len(sdkinfo.Sdkdata) > 1 {
- faceParam := protomsg.ParamFaceFeature{}
- err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
- if err != nil {
- logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- for _,faceExtCom := range faceParam.ExtComp {
- binfos := protomsg.Binfos{}
- err := proto.Unmarshal(faceExtCom.Comp, &binfos)
- if err != nil {
- logger.Info("瑙ｆ瀽浜鸿劯姣斿鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- logger.Info("_________________________________________________________________瑙ｆ瀽鍑虹殑浜鸿劯鐨勭浉浼肩殑搴曞簱鏁版嵁",binfos.Infos[0].CompareScore)
- }
- logger.Info("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅浜鸿劯鎻愬彇涓湁鍑犱釜鐩爣锛�",len(faceParam.ExtComp))
- for _, extComp := range faceParam.ExtComp {
- baseinfos := protomsg.Binfos{}
- err1 := proto.Unmarshal(extComp.Comp, &baseinfos)
- if err1 != nil {
- logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(extComp.Pos.Pos.RcFace), Score: float64(extComp.Pos.Pos.Quality)*100, IsYolo:false,ThftRes:*(extComp.Pos.Result),Liker:baseinfos.Infos}
- arg.Photo = append(arg.Photo, photoMap)
- }
- args.Sdkdata = append(args.Sdkdata,&arg)
- } else {
- continue
- }
- }
+ //if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
+ // arg := ruleserver.SdkData{}
+ // arg.TaskId = m.Tasklab.Taskid
+ // arg.SdkId = sdkinfo.Sdkid
+ // arg.SdkName = sdkinfo.SdkName
+ // arg.IsYolo = false
+ // bdata, err := util.UnCompress(m.Data)
+ // if err != nil {
+ // panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ // }
+ // i := protomsg.Image{}
+ // err = proto.Unmarshal(bdata, &i)
+ // arg.ImageWidth = int(i.Width)
+ // arg.ImageHeight = int(i.Height)
+ // // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
+ // arg.KeepRight = false
+ // arg.IsStatic = false
+ // if len(sdkinfo.Sdkdata) > 1 {
+ // faceParam := protomsg.ParamFaceFeature{}
+ // err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ // if err != nil {
+ // logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ // continue
+ // }
+ // for _,faceExtCom := range faceParam.ExtComp {
+ // binfos := protomsg.Binfos{}
+ // err := proto.Unmarshal(faceExtCom.Comp, &binfos)
+ // if err != nil {
+ // logger.Info("瑙ｆ瀽浜鸿劯姣斿鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ // continue
+ // }
+ // logger.Info("_________________________________________________________________瑙ｆ瀽鍑虹殑浜鸿劯鐨勭浉浼肩殑搴曞簱鏁版嵁",binfos.Infos[0].CompareScore)
+ // }
+ // logger.Info("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅浜鸿劯鎻愬彇涓湁鍑犱釜鐩爣锛�",len(faceParam.ExtComp))
+ // for _, extComp := range faceParam.ExtComp {
+ // baseinfos := protomsg.Binfos{}
+ // err1 := proto.Unmarshal(extComp.Comp, &baseinfos)
+ // if err1 != nil {
+ // logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ // continue
+ // }
+ // photoMap := ruleserver.PhotoMap{Rects: rectFormat(extComp.Pos.Pos.RcFace), Score: float64(extComp.Pos.Pos.Quality)*100, IsYolo:false,ThftRes:*(extComp.Pos.Result),Liker:baseinfos.Infos}
+ // arg.Photo = append(arg.Photo, photoMap)
+ // }
+ // args.Sdkdata = append(args.Sdkdata,&arg)
+ // } else {
+ // continue
+ // }
+ //}
}
return m
--
Gitblit v1.8.0