From 9bb6f2ddbdcc3c06799dd7beb2e19861f982d9d4 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 09 七月 2019 11:13:51 +0800
Subject: [PATCH] 给配置文件对应的结构体配上yaml的序列化

---
 insertdata/insertDataToEs.go |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 39335bd..e08c127 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,12 +1,13 @@
 package insertdata
 
 import (
+	"ruleprocess/logger"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/ioutil"
 	"net"
 	"ruleprocess/cache"
-	"ruleprocess/logger"
 	"strings"
 	"time"
 
@@ -15,9 +16,30 @@
 	"github.com/satori/go.uuid"
 	"ruleprocess/ruleserver"
 	"ruleprocess/util"
+	"github.com/go-yaml/yaml"
 )
+var weedfsUrl string
+type conf struct {
+	PhotoUrl string `yaml:"photoUrl"`
+}
+func init() {
+	logger.Info("_________________________________________鑰佸瓙鎯崇湅浣犳墽琛屼簡娌�")
+	fmt.Println("_________________________________________鑰佸瓙鎯崇湅浣犳墽琛屼簡娌�")
+	data, err := ioutil.ReadFile("./config/conf.yml")
+	if err != nil {
+		fmt.Println("璇诲彇閰嶇疆鏂囦欢鍑洪敊--",err)
+		logger.Error("璇诲彇閰嶇疆鏂囦欢鍑洪敊--",err)
+	}
+	fmt.Println("浠庨厤缃枃浠朵腑璇诲彇鐨勫�间负锛�",string(data))
+	c := conf{}
+	//鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙f瀽鎴恠truct绫诲瀷
+	yaml.Unmarshal(data, &c)
+	fmt.Println("c.PhotoUrl鐨勫�间负锛�",c.PhotoUrl)
+	weedfsUrl = c.PhotoUrl
+	fmt.Println("weedfsUrl鐨勫�间负锛�",weedfsUrl)
+	logger.Info("weedfsUrl鐨勫�间负锛�",weedfsUrl)
+}
 
-var weedfsUrl = "http://192.168.1.182:6333/submit"
 // 浜鸿劯鐨勬暟鎹粨鏋�
 type PerVideoPicture struct {
 	Id              string   `json:"id"`
@@ -84,6 +106,7 @@
 func InsertToEs(msg ruleserver.ResultMsg) {
 
 	// 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
+	logger.Info("------------------------------------浠庨厤缃枃浠惰鍙栫殑鍊硷細",weedfsUrl)
 	if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.Arg)) > 0 {
 		logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
 		for _, face := range msg.RuleResult["face"].([]ruleserver.Arg) {
@@ -150,7 +173,7 @@
 					race,
 					face.ThftRes.Smile,
 					face.ThftRes.Beauty,
-					"",
+					string(face.Feature),
 					[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
 					"鏆傛棤闆嗙兢",
 					localConfig.ServerId,

--
Gitblit v1.8.0