From 5e31a32f6ce2572cb01388150ddb325724ff15b8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 28 六月 2019 19:29:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver

---
 controllers/fileController.go |   21 +
 controllers/camera.go         |   84 ++++----
 models/dbtablepersons.go      |   19 +-
 controllers/pollConfig.go     |   52 ++--
 controllers/eventPush.go      |  115 ++++++------
 models/dbtables.go            |   21 +-
 controllers/dictionary.go     |   15 
 service/FaceSdkService.go     |   62 +++---
 middlewares/auth/jwt.go       |   40 ++--
 router/router.go              |   84 ++++----
 10 files changed, 258 insertions(+), 255 deletions(-)

diff --git a/controllers/camera.go b/controllers/camera.go
index 087703d..9cf2351 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -15,25 +15,25 @@
 type CameraController struct{}
 
 type CameraVo struct {
-	Id        string       `json:"id"`
-	Name      string       `json:"name"`
-	Type      int          `json:"type" `
-	Addr      string       `json:"addr"`
-	Areaid    uint         `json:"areaid"`
-	Longitude float64      `json:"longitude"`
-	Latitude  float64      `json:"latitude"`
-	Rtsp      string       `json:"rtsp"`
-	Ip        string       `json:"ip"`
-	Port      int          `json:"port"`
-	Username  string       `json:"username"`
-	Password  string       `json:"password"`
-	Brand     string       `json:"brand"`
-	Reserved  string       `json:"reserved"`
+	Id        string  `json:"id"`
+	Name      string  `json:"name"`
+	Type      int     `json:"type" `
+	Addr      string  `json:"addr"`
+	Areaid    uint    `json:"areaid"`
+	Longitude float64 `json:"longitude"`
+	Latitude  float64 `json:"latitude"`
+	Rtsp      string  `json:"rtsp"`
+	Ip        string  `json:"ip"`
+	Port      int     `json:"port"`
+	Username  string  `json:"username"`
+	Password  string  `json:"password"`
+	Brand     string  `json:"brand"`
+	Reserved  string  `json:"reserved"`
 
-	IsRunning bool 		   `json:"is_running"`//鏄惁姝ｅ湪瑙ｇ爜
-	RunEnable bool 		   `json:"run_enable"`//鎺у埗瀹炴椂澶勭悊鎴栬疆璇㈠鐞嗙殑寮�鍏�
-	RunType   int 		   `json:"run_type"`//澶勭悊绫诲瀷锛�0锛氳疆璇紝1锛氬疄鏃�
-	RunServerId string 	   `json:"run_server_id"`//褰撳墠姝ｅ湪澶勭悊鐨勫垎鏋愭湇鍔″櫒id
+	IsRunning   bool   `json:"is_running"`    //鏄惁姝ｅ湪瑙ｇ爜
+	RunEnable   bool   `json:"run_enable"`    //鎺у埗瀹炴椂澶勭悊鎴栬疆璇㈠鐞嗙殑寮�鍏�
+	RunType     int    `json:"run_type"`      //澶勭悊绫诲瀷锛�0锛氳疆璇紝1锛氬疄鏃�
+	RunServerId string `json:"run_server_id"` //褰撳墠姝ｅ湪澶勭悊鐨勫垎鏋愭湇鍔″櫒id
 }
 
 // @Summary 娣诲姞鎽勫儚鏈�
@@ -55,7 +55,7 @@
 		return
 	}
 	cam.Id = util.PseudoUuid()
-	paramBody :=util.Struct2Map(cam)
+	paramBody := util.Struct2Map(cam)
 	if api.CameraAdd(paramBody) {
 		util.ResponseFormat(c, code.Success, cam)
 		return
@@ -82,7 +82,7 @@
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟閿欒")
 		return
 	}
-	paramBody :=util.Struct2Map(cam)
+	paramBody := util.Struct2Map(cam)
 	if api.CameraAdd(paramBody) {
 		util.ResponseFormat(c, code.Success, cam)
 		return
@@ -103,11 +103,11 @@
 	var api dbapi.CameraApi
 	cid := c.Param("cid")
 
-	if api.CameraDelete(cid){
+	if api.CameraDelete(cid) {
 		util.ResponseFormat(c, code.Success, "鍒犻櫎鎴愬姛")
 		return
 	}
-	util.ResponseFormat(c, code.ComError,"鍒犻櫎澶辫触")
+	util.ResponseFormat(c, code.ComError, "鍒犻櫎澶辫触")
 }
 
 // @Summary 鏄剧ず鎽勫儚鏈�
@@ -121,9 +121,9 @@
 func (ac CameraController) CameraSel(c *gin.Context) {
 	var api dbapi.CameraApi
 	cid := c.Param("cid")
-	camera,err := api.GetCameraById(cid)
-	if err !=nil {
-		util.ResponseFormat(c,code.ComError,"鏌ヨ澶辫触")
+	camera, err := api.GetCameraById(cid)
+	if err != nil {
+		util.ResponseFormat(c, code.ComError, "鏌ヨ澶辫触")
 		return
 	}
 
@@ -210,8 +210,8 @@
 	fmt.Println("runType:", runTypeStr)
 	fmt.Println("cameraName:", cameraName)
 	runType, err := strconv.Atoi(runTypeStr)
-	if err !=nil || (runType !=0 && runType !=1) {
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+	if err != nil || (runType != 0 && runType != 1) {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
 	var api dbapi.CameraApi
@@ -220,9 +220,9 @@
 		dataBytes, _ := json.Marshal(list)
 		var cams []CameraVo
 		json.Unmarshal(dataBytes, &cams)
-		util.ResponseFormat(c,code.Success,cams)
+		util.ResponseFormat(c, code.Success, cams)
 	} else {
-		util.ResponseFormat(c,code.ComError,err)
+		util.ResponseFormat(c, code.ComError, err)
 	}
 }
 
@@ -235,28 +235,28 @@
 // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
 // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
 // @Router /data/api-v/camera/updateRunEnable [post]
-func (cc CameraController) UpdateRunEnable(c *gin.Context){
+func (cc CameraController) UpdateRunEnable(c *gin.Context) {
 	cameraId := c.PostForm("cameraId")
 	enableStr := c.PostForm("runEnable")
 	runEnable, err := strconv.ParseBool(enableStr)
-	if cameraId == "" || err !=nil {
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+	if cameraId == "" || err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
 
 	var api dbapi.CameraApi
 	b, data := api.UpdateRunEnable(cameraId, runEnable)
-	fmt.Println("data:",data)
+	fmt.Println("data:", data)
 	if b {
-		util.ResponseFormat(c,code.Success,data)
+		util.ResponseFormat(c, code.Success, data)
 	} else {
-		util.ResponseFormat(c,code.ComError,"鏇存柊澶辫触")
+		util.ResponseFormat(c, code.ComError, "鏇存柊澶辫触")
 	}
 }
 
 type CameraChangeRunVo struct {
 	CameraIds []string `json:"camera_ids"`
-	RunType int `json:"run_type"`
+	RunType   int      `json:"run_type"`
 }
 
 // @Summary 鎽勫儚鏈鸿疆璇㈠拰瀹炴椂鐘舵�佸垏鎹�
@@ -267,18 +267,18 @@
 // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
 // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
 // @Router /data/api-v/camera/changeRunType [post]
-func (cc CameraController) ChangeRunType(c *gin.Context){
+func (cc CameraController) ChangeRunType(c *gin.Context) {
 	var ccrVo CameraChangeRunVo
-	if err := c.BindJSON(&ccrVo);err !=nil{
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+	if err := c.BindJSON(&ccrVo); err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
 	paramBody := util.Struct2Map(ccrVo)
 	var api dbapi.CameraApi
 	b, data := api.ChangeRunType(paramBody)
 	if b {
-		util.ResponseFormat(c,code.Success,data)
+		util.ResponseFormat(c, code.Success, data)
 	} else {
-		util.ResponseFormat(c,code.ComError,"鏇存柊澶辫触")
+		util.ResponseFormat(c, code.ComError, "鏇存柊澶辫触")
 	}
-}
\ No newline at end of file
+}
diff --git a/controllers/dictionary.go b/controllers/dictionary.go
index 9794cbe..a68bc28 100644
--- a/controllers/dictionary.go
+++ b/controllers/dictionary.go
@@ -2,13 +2,12 @@
 
 import (
 	"basic.com/dbapi.git"
+	"github.com/gin-gonic/gin"
 	"webserver/extend/code"
 	"webserver/extend/util"
-	"github.com/gin-gonic/gin"
 )
 
 type DictionaryController struct {
-
 }
 
 // @Summary 鏍规嵁绫诲瀷鏌ユ壘瀛楀吀
@@ -23,9 +22,9 @@
 	var api dbapi.DicApi
 	flag, data := api.FindByType("")
 	if flag {
-		util.ResponseFormat(c,code.Success,data)
+		util.ResponseFormat(c, code.Success, data)
 	} else {
-		util.ResponseFormat(c,code.ComError,data)
+		util.ResponseFormat(c, code.ComError, data)
 	}
 }
 
@@ -40,14 +39,14 @@
 func (controller DictionaryController) FindByParentId(c *gin.Context) {
 	parentId := c.Query("parentId")
 	if parentId == "" {
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
 	var api dbapi.DicApi
 	flag, data := api.FindByParentId(parentId)
 	if flag {
-		util.ResponseFormat(c,code.Success,data)
+		util.ResponseFormat(c, code.Success, data)
 	} else {
-		util.ResponseFormat(c,code.ComError,"鏌ヨ澶辫触")
+		util.ResponseFormat(c, code.ComError, "鏌ヨ澶辫触")
 	}
-}
\ No newline at end of file
+}
diff --git a/controllers/eventPush.go b/controllers/eventPush.go
index b604fcd..18f8a49 100644
--- a/controllers/eventPush.go
+++ b/controllers/eventPush.go
@@ -8,44 +8,43 @@
 )
 
 type EventPushController struct {
-
 }
 
 type EventPushVo struct {
-	Id string `json:"id"`
-	Name string `json:"name"`
-	TimeStart string `json:"time_start"`
-	TimeEnd string `json:"time_end"`
-	IsSatisfyAll bool `json:"is_satisfy_all"`
-	RuleText string `json:"rule_text"`
-	Enable bool `json:"enable"`
-	LinkType string `json:"link_type"`
-	LinkDevice string `json:"link_device"`
+	Id           string `json:"id"`
+	Name         string `json:"name"`
+	TimeStart    string `json:"time_start"`
+	TimeEnd      string `json:"time_end"`
+	IsSatisfyAll bool   `json:"is_satisfy_all"`
+	RuleText     string `json:"rule_text"`
+	Enable       bool   `json:"enable"`
+	LinkType     string `json:"link_type"`
+	LinkDevice   string `json:"link_device"`
 
 	IpPorts []EventPushServerPortVo `json:"ip_ports"`
-	Urls []EventUrlVo `json:"urls"`
-	Rules []EventPushRuleVo `json:"rules"`
+	Urls    []EventUrlVo            `json:"urls"`
+	Rules   []EventPushRuleVo       `json:"rules"`
 }
 
 type EventPushRuleVo struct {
-	Id string `json:"id"`
-	TopicType string `json:"topic_type"`//鍙傛暟涓婚,鐩墠鍒嗕负浜旂被锛堟憚鍍忔満銆佸簳搴撱�佷换鍔°�佷汉鍛樸�佹姤璀︾瓑绾э級
-	TopicArg string `json:"topic_arg"`//涓婚瀵瑰簲鐨勫叿浣撳弬鏁�
-	Operator string `json:"operator"`
+	Id           string `json:"id"`
+	TopicType    string `json:"topic_type"` //鍙傛暟涓婚,鐩墠鍒嗕负浜旂被锛堟憚鍍忔満銆佸簳搴撱�佷换鍔°�佷汉鍛樸�佹姤璀︾瓑绾э級
+	TopicArg     string `json:"topic_arg"`  //涓婚瀵瑰簲鐨勫叿浣撳弬鏁�
+	Operator     string `json:"operator"`
 	OperatorType string `json:"operator_type"`
-	RuleValue string `json:"rule_value"`
-	EventPushId string `json:"event_push_id"`
+	RuleValue    string `json:"rule_value"`
+	EventPushId  string `json:"event_push_id"`
 }
 
 type EventPushServerPortVo struct {
 	ServerIp string `json:"server_ip"`
-	Port int `json:"port"`
-	Enable bool `json:"enable"`
+	Port     int    `json:"port"`
+	Enable   bool   `json:"enable"`
 }
 
 type EventUrlVo struct {
-	Url string `json:"url"`
-	Enable bool `json:"enable"`
+	Url    string `json:"url"`
+	Enable bool   `json:"enable"`
 }
 
 // @Summary 浜嬩欢鎺ㄩ�佷繚瀛�
@@ -55,19 +54,19 @@
 // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
 // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
 // @Router /data/api-v/eventPush/save [post]
-func (epc EventPushController) Save(c *gin.Context){
+func (epc EventPushController) Save(c *gin.Context) {
 	var saveBody EventPushVo
-	if err := c.BindJSON(&saveBody);err !=nil {
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+	if err := c.BindJSON(&saveBody); err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
 	var api dbapi.EventPushApi
 	paramBody := util.Struct2Map(saveBody)
 	flag, data := api.Save(paramBody)
 	if flag {
-		util.ResponseFormat(c,code.Success,data)
+		util.ResponseFormat(c, code.Success, data)
 	} else {
-		util.ResponseFormat(c,code.ComError,data)
+		util.ResponseFormat(c, code.ComError, data)
 	}
 }
 
@@ -80,19 +79,19 @@
 // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
 // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
 // @Router /data/api-v/eventPush/findByEventTopic [get]
-func (epc EventPushController) FindByEventTopic(c *gin.Context){
+func (epc EventPushController) FindByEventTopic(c *gin.Context) {
 	topic := c.Query("topic")
 	childType := c.Query("type")
-	if topic == ""{
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+	if topic == "" {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
 	var api dbapi.EventPushApi
 	flag, data := api.FindByEventTopic(topic, childType)
 	if flag {
-		util.ResponseFormat(c,code.Success,data)
+		util.ResponseFormat(c, code.Success, data)
 	} else {
-		util.ResponseFormat(c,code.ComError,data)
+		util.ResponseFormat(c, code.ComError, data)
 	}
 }
 
@@ -104,14 +103,14 @@
 // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
 // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
 // @Router /data/api-v/eventPush/findAll [get]
-func (controller EventPushController) FindAll(c *gin.Context){
+func (controller EventPushController) FindAll(c *gin.Context) {
 	name := c.Query("name")
 	var api dbapi.EventPushApi
-	flag,data := api.FindAll(name)
+	flag, data := api.FindAll(name)
 	if flag {
-		util.ResponseFormat(c,code.Success,data)
-	} else{
-		util.ResponseFormat(c,code.ComError,"")
+		util.ResponseFormat(c, code.Success, data)
+	} else {
+		util.ResponseFormat(c, code.ComError, "")
 	}
 }
 
@@ -123,24 +122,24 @@
 // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
 // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
 // @Router /data/api-v/eventPush/getById [get]
-func (controller EventPushController) GetById(c *gin.Context){
+func (controller EventPushController) GetById(c *gin.Context) {
 	id := c.Query("id")
-	if id == ""{
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+	if id == "" {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
 	var api dbapi.EventPushApi
-	flag,data := api.GetById(id)
+	flag, data := api.GetById(id)
 	if flag {
-		util.ResponseFormat(c,code.Success, data)
-	} else{
-		util.ResponseFormat(c,code.ComError,"")
+		util.ResponseFormat(c, code.Success, data)
+	} else {
+		util.ResponseFormat(c, code.ComError, "")
 	}
 }
 
 type ChangeStatusVo struct {
-	Id string `json:"id"`
-	Enable bool `json:"enable"`
+	Id     string `json:"id"`
+	Enable bool   `json:"enable"`
 }
 
 // @Summary 鏀瑰彉enable鐘舵��
@@ -151,19 +150,19 @@
 // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
 // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
 // @Router /data/api-v/eventPush/changeStatus [post]
-func (controller EventPushController) ChangeStatus(c *gin.Context){
+func (controller EventPushController) ChangeStatus(c *gin.Context) {
 	var statusBody ChangeStatusVo
 	err := c.BindJSON(&statusBody)
-	if err !=nil {
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+	if err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
 	var api dbapi.EventPushApi
 	flag, data := api.ChangeStatus(statusBody.Id, statusBody.Enable)
-	if flag{
-		util.ResponseFormat(c,code.Success,data)
+	if flag {
+		util.ResponseFormat(c, code.Success, data)
 	} else {
-		util.ResponseFormat(c,code.ComError,data)
+		util.ResponseFormat(c, code.ComError, data)
 	}
 }
 
@@ -176,17 +175,17 @@
 // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
 // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
 // @Router /data/api-v/eventPush/delete [post]
-func (controller EventPushController) Delete(c *gin.Context){
+func (controller EventPushController) Delete(c *gin.Context) {
 	id := c.PostForm("id")
-	if id ==""{
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+	if id == "" {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
 	var api dbapi.EventPushApi
 	flag, data := api.Delete(id)
-	if flag{
-		util.ResponseFormat(c,code.Success,data)
+	if flag {
+		util.ResponseFormat(c, code.Success, data)
 	} else {
-		util.ResponseFormat(c,code.ComError,data)
+		util.ResponseFormat(c, code.ComError, data)
 	}
 }
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 62899dd..98b40a0 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -17,6 +17,7 @@
 	"webserver/extend/util"
 	"webserver/models"
 	"webserver/service"
+
 )
 
 type FileController struct {
@@ -86,12 +87,13 @@
 		util.ResponseFormat(c, code.Success, field)
 	}
 }
+
 // @Description 浜哄憳鐓х墖涓婁紶骞惰幏鍙栫壒寰佸��
 // @Router /data/api-v/dbperson/fileUploadTest [POST]
-func (controller FileController) UploadPersonTest(c *gin.Context){
+func (controller FileController) UploadPersonTest(c *gin.Context) {
 	file, header, err := c.Request.FormFile("file") //image杩欎釜鏄痷plaodify鍙傛暟瀹氫箟涓殑   'fileObjName':'image'
 	if err != nil {
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
 	//鏂囦欢鐨勫悕绉�
@@ -152,6 +154,7 @@
 			feat := features[0]["feature"].([]byte)   // linux
 		if len(feat) != 2560 {                                // linux
 			return field,nil,errors.New("NotFeatureFindError")
+
 		}    */                     // linux
 
 		//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
@@ -164,12 +167,15 @@
 			}
 		}
 
+
 		dbperson := new(models.Dbtablepersons)
-		dbperson.FaceUrl = picIp+field       //  鍥剧墖璺粡
-		dbperson.TableId = tableId  //
-		dbperson.PersonName = filename // 鍥剧墖鍚�
+		dbperson.FaceFeature = picIp + field //  鍥剧墖璺粡
+		dbperson.TableId = tableId           //
+		dbperson.PersonName = filename       // 鍥剧墖鍚�
 		// 婕旂ずbase64缂栫爜
-		dbperson.Feature = faceBase64 // 鐗瑰緛鍊糱ase64 鐮�
+
+		dbperson.FaceFeature = faceBase64 // 鐗瑰緛鍊糱ase64 鐮�
+
 		result := addDbPerson(dbperson)
 		return field, result, nil
 	} else {
@@ -192,7 +198,6 @@
 }
 
 /**涓婁紶鏂规硶**/
-
 
 // @Summary 鎵归噺娣诲姞搴曞簱浜哄憳
 // @Description  渚濇嵁鍥剧墖鎵归噺娣诲姞搴曞簱浜哄憳
@@ -299,7 +304,7 @@
 	//features := gorun.GetSimpleFaceDetect(picIp + "/" + field) // 鐗瑰緛鍊�  鍙湪linux 涓�
 	//feat := []byte("hello world")           // windows 娴嬭瘯鏀惧紑
 	result := make(map[string]interface{}, 0)
-	result["uploadImage"] = picIp+field
+	result["uploadImage"] = picIp + field
 	smUrl := make([]string, 0)
 	//for _, feature := range features {         // linux
 	// 鑾峰彇鍥剧墖
diff --git a/controllers/pollConfig.go b/controllers/pollConfig.go
index 18a23e2..014a071 100644
--- a/controllers/pollConfig.go
+++ b/controllers/pollConfig.go
@@ -9,14 +9,13 @@
 )
 
 type PollConfigController struct {
-
 }
 
 type PollConfig struct {
-	ServerId string `json:"server_id"`//鏈嶅姟鍣╥d
-	PollPeriod int `json:"poll_period"`//杞鍛ㄦ湡
-	Delay int `json:"delay"`//寤舵椂鏃堕棿
-	Enable bool `json:"enable"`//鏄惁鍚敤杞
+	ServerId   string `json:"server_id"`   //鏈嶅姟鍣╥d
+	PollPeriod int    `json:"poll_period"` //杞鍛ㄦ湡
+	Delay      int    `json:"delay"`       //寤舵椂鏃堕棿
+	Enable     bool   `json:"enable"`      //鏄惁鍚敤杞
 }
 
 // @Summary 淇濆瓨杞鍛ㄦ湡
@@ -27,19 +26,19 @@
 // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
 // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
 // @Router /data/api-v/pollConfig/savePollPeriod [post]
-func (controller PollConfigController) SavePollPeriod(c *gin.Context){
+func (controller PollConfigController) SavePollPeriod(c *gin.Context) {
 	periodStr := c.PostForm("period")
 	period, err := strconv.Atoi(periodStr)
-	if periodStr =="" || err !=nil{
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+	if periodStr == "" || err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
 	var api dbapi.SysSetApi
 	b, data := api.SavePollPeriod(period)
 	if b {
-		util.ResponseFormat(c,code.Success,data)
+		util.ResponseFormat(c, code.Success, data)
 	} else {
-		util.ResponseFormat(c,code.ComError,"淇濆瓨澶辫触")
+		util.ResponseFormat(c, code.ComError, "淇濆瓨澶辫触")
 	}
 }
 
@@ -51,19 +50,19 @@
 // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
 // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
 // @Router /data/api-v/pollConfig/savePollDelay [post]
-func (controller PollConfigController) SavePollDelay(c *gin.Context){
+func (controller PollConfigController) SavePollDelay(c *gin.Context) {
 	delayStr := c.PostForm("delay")
 	delay, err := strconv.Atoi(delayStr)
-	if delayStr =="" || err !=nil{
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+	if delayStr == "" || err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
 	var api dbapi.SysSetApi
 	b, data := api.SavePollDelay(delay)
 	if b {
-		util.ResponseFormat(c,code.Success,data)
+		util.ResponseFormat(c, code.Success, data)
 	} else {
-		util.ResponseFormat(c,code.ComError,"淇濆瓨澶辫触")
+		util.ResponseFormat(c, code.ComError, "淇濆瓨澶辫触")
 	}
 }
 
@@ -74,19 +73,20 @@
 // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
 // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
 // @Router /data/api-v/pollConfig/getPollConfig [get]
-func (controller PollConfigController) GetPollConfig(c *gin.Context){
+func (controller PollConfigController) GetPollConfig(c *gin.Context) {
 	var api dbapi.SysSetApi
 	b, data := api.GetPollConfig()
 	if b {
-		util.ResponseFormat(c,code.Success,data)
-	}else{
-		util.ResponseFormat(c,code.ComError,"鏌ヨ澶辫触")
+		util.ResponseFormat(c, code.Success, data)
+	} else {
+		util.ResponseFormat(c, code.ComError, "鏌ヨ澶辫触")
 	}
 }
 
 type PollEnableVo struct {
 	Enable bool `json:"enable"`
 }
+
 // @Summary 鍒囨崲杞寮�鍏�
 // @Description 鍒囨崲杞寮�鍏�
 // @Produce json
@@ -95,16 +95,16 @@
 // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
 // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
 // @Router /data/api-v/pollConfig/updateEnable [post]
-func (controller PollConfigController) UpdateEnable(c *gin.Context){
+func (controller PollConfigController) UpdateEnable(c *gin.Context) {
 	var argBody PollEnableVo
-	if err := c.BindJSON(&argBody);err !=nil {
-		util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+	if err := c.BindJSON(&argBody); err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
 	var api dbapi.SysSetApi
-	if api.UpdatePollEnable(argBody.Enable){
-		util.ResponseFormat(c,code.Success,"淇敼鎴愬姛")
+	if api.UpdatePollEnable(argBody.Enable) {
+		util.ResponseFormat(c, code.Success, "淇敼鎴愬姛")
 	} else {
-		util.ResponseFormat(c,code.ComError,"淇敼澶辫触")
+		util.ResponseFormat(c, code.ComError, "淇敼澶辫触")
 	}
-}
\ No newline at end of file
+}
diff --git a/middlewares/auth/jwt.go b/middlewares/auth/jwt.go
index 01fdab9..0187b2f 100644
--- a/middlewares/auth/jwt.go
+++ b/middlewares/auth/jwt.go
@@ -13,14 +13,14 @@
 type jwtAuthManager struct {
 	secret string
 	expire time.Duration
-	alg string
+	alg    string
 }
 
-func NewJwtAuthDriver() *jwtAuthManager{
+func NewJwtAuthDriver() *jwtAuthManager {
 	return &jwtAuthManager{
-		secret:TokenKey,
-		expire:time.Hour*8,
-		alg:"HS256",
+		secret: TokenKey,
+		expire: time.Hour * 8,
+		alg:    "HS256",
 	}
 }
 
@@ -34,41 +34,41 @@
 	if len(t) < 2 {
 		return false
 	}
-	var keyFunc = func(token *jwtLib.Token) (interface{},error) {
+	var keyFunc = func(token *jwtLib.Token) (interface{}, error) {
 		b := []byte(jwtAuth.secret)
-		return b,nil
+		return b, nil
 	}
-	authJwtToken, err:= request.ParseFromRequest(c.Request,request.OAuth2Extractor,keyFunc)
-	if err !=nil {
+	authJwtToken, err := request.ParseFromRequest(c.Request, request.OAuth2Extractor, keyFunc)
+	if err != nil {
 		return false
 	}
 
-	c.Set("User",map[string]interface{}{
-		"token":authJwtToken,
+	c.Set("User", map[string]interface{}{
+		"token": authJwtToken,
 	})
 
 	return authJwtToken.Valid
 }
 
-func (jwtAuth *jwtAuthManager) User(c *gin.Context) interface{}{
+func (jwtAuth *jwtAuthManager) User(c *gin.Context) interface{} {
 	var jwtToken *jwtLib.Token
-	if jwtUser, exist := c.Get("User");!exist{
-		tokenStr :=strings.Replace(c.Request.Header.Get("Authorization"),"Bearer ","",-1)
-		if tokenStr == ""{
+	if jwtUser, exist := c.Get("User"); !exist {
+		tokenStr := strings.Replace(c.Request.Header.Get("Authorization"), "Bearer ", "", -1)
+		if tokenStr == "" {
 			return map[interface{}]interface{}{}
 		}
 		var err error
-		jwtToken,err = jwtLib.Parse(tokenStr, func(token *jwtLib.Token) (interface{}, error) {
-			b :=[]byte(jwtAuth.secret)
-			return b,nil
+		jwtToken, err = jwtLib.Parse(tokenStr, func(token *jwtLib.Token) (interface{}, error) {
+			b := []byte(jwtAuth.secret)
+			return b, nil
 		})
-		if err !=nil {
+		if err != nil {
 			return nil
 		}
 	} else {
 		jwtToken = jwtUser.(map[string]interface{})["token"].(*jwtLib.Token)
 	}
-	if claims,ok :=jwtToken.Claims.(jwtLib.MapClaims);ok && jwtToken.Valid{
+	if claims, ok := jwtToken.Claims.(jwtLib.MapClaims); ok && jwtToken.Valid {
 		var user map[string]interface{}
 		if err := json.Unmarshal([]byte(claims["user"].(string)), &user); err != nil {
 			return nil
diff --git a/models/dbtablepersons.go b/models/dbtablepersons.go
index dd43f4b..bee38f6 100644
--- a/models/dbtablepersons.go
+++ b/models/dbtablepersons.go
@@ -1,15 +1,14 @@
 package models
 
-type Dbtablepersons   struct {
+type Dbtablepersons struct {
 	BaseEntity
-	TableId string `json:"tableId,omitempty" example:"搴撹〃id"`
-	Feature string  `json:"feature,omitempty" example:"浜鸿劯鐗瑰緛鍊�"`
-	FaceUrl string `json:"faceUrl,omitempty" example:"鍥剧墖璺緞"`
-	PersonName string `json:"personName,omitempty" example:"浜哄憳濮撳悕"`
-	Age string `json:"age,omitempty"  example:"骞撮緞"`
-	Sex string  `json:"sex,omitempty" example:"鎬у埆 鐢� 濂�"`
-	Idcard string `json:"idcard,omitempty" example:"韬唤璇�"`
-	PhoneNum string `json:"phoneNum,omitempty" example:"鎵嬫満鍙风爜"`
+	TableId      string `json:"tableId,omitempty" example:"搴撹〃id"`
+	FaceFeature  string `json:"faceFeature,omitempty" example:"浜鸿劯鐗瑰緛鍊�"`
+	PersonPicUrl string `json:"personPicUrl,omitempty" example:"鍥剧墖璺緞"`
+	PersonName   string `json:"personName,omitempty" example:"浜哄憳濮撳悕"`
+	Age          string `json:"age,omitempty"  example:"骞撮緞"`
+	Sex          string `json:"sex,omitempty" example:"鎬у埆 鐢� 濂�"`
+	IdCard       string `json:"idCard,omitempty" example:"韬唤璇�"`
+	PhoneNum     string `json:"phoneNum,omitempty" example:"鎵嬫満鍙风爜"`
 	MonitorLevel string `json:"monitorLevel,omitempty" example:"绛夌骇"`
 }
-
diff --git a/models/dbtables.go b/models/dbtables.go
index 6f87f11..fc19c8a 100644
--- a/models/dbtables.go
+++ b/models/dbtables.go
@@ -2,15 +2,14 @@
 
 type Dbtables struct {
 	BaseEntity
-	TableName string  `json:"tableName,omitempty" example:"搴曞簱123"`//琛ㄥ悕
-	TableDesc string  `json:"tableDesc,omitempty" example:"搴曞簱鎻忚堪"`//鎻忚堪
-	TableType string  `json:"tableType,omitempty" example:"person,car"`//浜哄憳琛�"person
-	BwType string   `json:"bwType,omitempty" example:"榛戝悕鍗�:1,鐧藉悕鍗�:0"`  //榛戝悕鍗曪細1锛岀櫧鍚嶅崟锛�0
-	StartTime string  `json:"startTime,omitempty" example:"2019-01-12 12:14:56"` //鏈夋晥鏈熷紑濮嬫椂闂�
-	EndTime string    `json:"endTime,omitempty" example:"2019-10-12 12:14:56"` //鏈夋晥鏈熺粨鏉熸椂闂�
-	UploadFlag string `json:"uploadFlag,omitempty" example:"涓婁紶鏍囧織"` //
-	CmpThreshold string `json:"cmpThreshold,omitempty" example:"45"`// //浜鸿劯姣斿闃堝��
-	SyncType string  `json:"syncType,omitempty" example:"1:鍚屾搴擄紝2锛氭湰鍦板簱"` //鏄惁鏄悓姝ュ簱(1:鍚屾搴擄紝2锛氭湰鍦板簱)
-	Indeviceid string `json:"indeviceid,omitempty" example:"鏈湴搴撴墍灞炵殑鍒嗘瀽璁惧id锛屽鏋滄槸鍚屾搴撳氨涓嶉渶瑕佽褰�"`// 鍒嗘瀽璁惧id(鏈湴搴撴墍灞炵殑鍒嗘瀽璁惧id锛屽鏋滄槸鍚屾搴撳氨涓嶉渶瑕佽褰�)
+	TableName string `json:"tableName,omitempty" example:"搴曞簱123"`               //琛ㄥ悕
+	TableDesc string `json:"tableDesc,omitempty" example:"搴曞簱鎻忚堪"`                //鎻忚堪
+	TableType string `json:"tableType,omitempty" example:"person,car"`          //浜哄憳琛�"person
+	BwType    string `json:"bwType,omitempty" example:"榛戝悕鍗�:1,鐧藉悕鍗�:0"`            //榛戝悕鍗曪細1锛岀櫧鍚嶅崟锛�0
+	StartTime string `json:"startTime,omitempty" example:"2019-01-12 12:14:56"` //鏈夋晥鏈熷紑濮嬫椂闂�
+	EndTime   string `json:"endTime,omitempty" example:"2019-10-12 12:14:56"`   //鏈夋晥鏈熺粨鏉熸椂闂�
+	//UploadFlag string `json:"uploadFlag,omitempty" example:"涓婁紶鏍囧織"` //
+	//CmpThreshold string `json:"cmpThreshold,omitempty" example:"45"`// //浜鸿劯姣斿闃堝��
+	IsSync        string `json:"isSync,omitempty" example:"1:鍚屾搴擄紝2锛氭湰鍦板簱"`                      //鏄惁鏄悓姝ュ簱(1:鍚屾搴擄紝2锛氭湰鍦板簱)
+	AnalyServerId string `json:"analyServerId,omitempty" example:"鏈湴搴撴墍灞炵殑鍒嗘瀽璁惧id锛屽鏋滄槸鍚屾搴撳氨涓嶉渶瑕佽褰�"` // 鍒嗘瀽璁惧id(鏈湴搴撴墍灞炵殑鍒嗘瀽璁惧id锛屽鏋滄槸鍚屾搴撳氨涓嶉渶瑕佽褰�)
 }
-
diff --git a/router/router.go b/router/router.go
index 812b254..184334d 100644
--- a/router/router.go
+++ b/router/router.go
@@ -30,19 +30,19 @@
 	esSearchController := new(controllers.EsSearchController)
 	realTimeController := new(controllers.RealTimeController)
 	cameraTimeRuleController := new(controllers.CameraTimeruleController)
-	polygonController :=new (controllers.CameraPolygonController)
-	cameraTaskController :=new(controllers.CameraTaskController)
-	cameraTaskArgsController :=new(controllers.CameraTaskArgsController)
-	dicController :=new(controllers.DictionaryController)
-	userController :=new(controllers.UserController)
-	eventPushController :=new(controllers.EventPushController)
-	pollConfigController :=new(controllers.PollConfigController)
+	polygonController := new(controllers.CameraPolygonController)
+	cameraTaskController := new(controllers.CameraTaskController)
+	cameraTaskArgsController := new(controllers.CameraTaskArgsController)
+	dicController := new(controllers.DictionaryController)
+	userController := new(controllers.UserController)
+	eventPushController := new(controllers.EventPushController)
+	pollConfigController := new(controllers.PollConfigController)
 	fileController := new(controllers.FileController)
 
 	urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
-	userApi :=r.Group(urlPrefix+"/user")
+	userApi := r.Group(urlPrefix + "/user")
 	{
-		userApi.POST("/login",userController.Login)
+		userApi.POST("/login", userController.Login)
 	}
 
 	//鍖哄煙绠＄悊
@@ -68,33 +68,33 @@
 
 		camera.GET("/delTask/:cameraId/:taskId", cameraController.CameraDelTask)
 		camera.POST("/saveTask", cameraController.CameraTaskSave)
-		camera.GET("/getRulesByCameraAndTask",cameraTaskArgsController.FindByCameraAndTask)
-		camera.GET("/getCamerasByRunType",cameraController.GetCamerasByRunType)
-		camera.POST("/updateRunEnable",cameraController.UpdateRunEnable)
-		camera.POST("/changeRunType",cameraController.ChangeRunType)
+		camera.GET("/getRulesByCameraAndTask", cameraTaskArgsController.FindByCameraAndTask)
+		camera.GET("/getCamerasByRunType", cameraController.GetCamerasByRunType)
+		camera.POST("/updateRunEnable", cameraController.UpdateRunEnable)
+		camera.POST("/changeRunType", cameraController.ChangeRunType)
 	}
 
-	cameraTaskArgsApi :=r.Group(urlPrefix + "/cameraTaskArgs")
+	cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
 	{
-		cameraTaskArgsApi.GET("/deleteByGroup",cameraTaskArgsController.DeleteByGroup)
-		cameraTaskArgsApi.POST("/getLinkRulesByCameraIds",cameraTaskArgsController.GetLinkRulesByCameraIds)
-		cameraTaskArgsApi.POST("/saveLinkRulesByGroup",cameraTaskArgsController.SaveLinkRulesByGroup)
+		cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
+		cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
+		cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
 	}
 
 	cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
 	{
-		cameraTaskApi.POST("/saveIsDataTrans",cameraTaskController.SaveIsDataTrans)
-		cameraTaskApi.POST("/saveAlarmLevelByGroup",cameraTaskController.SaveAlarmLevelByGroup)
-		cameraTaskApi.POST("/updateCameraTaskStatus",cameraTaskController.UpdateCameraTaskStatus)
+		cameraTaskApi.POST("/saveIsDataTrans", cameraTaskController.SaveIsDataTrans)
+		cameraTaskApi.POST("/saveAlarmLevelByGroup", cameraTaskController.SaveAlarmLevelByGroup)
+		cameraTaskApi.POST("/updateCameraTaskStatus", cameraTaskController.UpdateCameraTaskStatus)
 	}
 
-	polygon := r.Group(urlPrefix+"/polygon")
+	polygon := r.Group(urlPrefix + "/polygon")
 	{
 		polygon.POST("/save", polygonController.Save)
 		polygon.GET("/findByCameraId", polygonController.FindByCameraId)
 		//polygon.GET("/delete", polygonController.Delete)
-		polygon.GET("/updateDefenceStateByPolygonId",polygonController.UpdateDefenceStateByPolygonId)
-		polygon.GET("/updateDefenceStateByCameraId",polygonController.UpdateDefenceStateByCameraId)
+		polygon.GET("/updateDefenceStateByPolygonId", polygonController.UpdateDefenceStateByPolygonId)
+		polygon.GET("/updateDefenceStateByCameraId", polygonController.UpdateDefenceStateByCameraId)
 	}
 
 	// 浠诲姟绠＄悊
@@ -143,7 +143,7 @@
 		vdbperson.POST("/deleteMoreDbPerson", dbPersonCont.DeleteMoreDbPerson)
 		vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)
 
-		vdbperson.POST("/fileUploadTest",fileController.UploadPersonTest)
+		vdbperson.POST("/fileUploadTest", fileController.UploadPersonTest)
 	}
 
 	// 绯荤粺璁剧疆 鎿嶄綔
@@ -164,8 +164,8 @@
 	{
 		sdkApi.POST("/saveSdk", sdkController.Save)
 		sdkApi.GET("/findAllSdk", sdkController.FindAllSdk)
-		sdkApi.GET("/findByTaskId",sdkController.FindByTaskId)
-		sdkApi.GET("/getById",sdkController.GetById)
+		sdkApi.GET("/findByTaskId", sdkController.FindByTaskId)
+		sdkApi.GET("/getById", sdkController.GetById)
 	}
 
 	cameraTimeApi := r.Group(urlPrefix + "/cameraTimerule")
@@ -174,33 +174,33 @@
 		cameraTimeApi.GET("/delete", cameraTimeRuleController.Delete)
 		cameraTimeApi.GET("/findAll", cameraTimeRuleController.FindAll)
 	}
-	dicApi :=r.Group(urlPrefix+"/dictionary")
+	dicApi := r.Group(urlPrefix + "/dictionary")
 	{
-		dicApi.GET("/findByType",dicController.FindByType)
-		dicApi.GET("/findByParentId",dicController.FindByParentId)
+		dicApi.GET("/findByType", dicController.FindByType)
+		dicApi.GET("/findByParentId", dicController.FindByParentId)
 	}
-	eventPushApi :=r.Group(urlPrefix+"/eventPush")
+	eventPushApi := r.Group(urlPrefix + "/eventPush")
 	{
-		eventPushApi.POST("/save",eventPushController.Save)
-		eventPushApi.GET("/findByEventTopic",eventPushController.FindByEventTopic)
-		eventPushApi.GET("/findAll",eventPushController.FindAll)
-		eventPushApi.GET("/getById",eventPushController.GetById)
-		eventPushApi.POST("/changeStatus",eventPushController.ChangeStatus)
-		eventPushApi.POST("/delete",eventPushController.Delete)
+		eventPushApi.POST("/save", eventPushController.Save)
+		eventPushApi.GET("/findByEventTopic", eventPushController.FindByEventTopic)
+		eventPushApi.GET("/findAll", eventPushController.FindAll)
+		eventPushApi.GET("/getById", eventPushController.GetById)
+		eventPushApi.POST("/changeStatus", eventPushController.ChangeStatus)
+		eventPushApi.POST("/delete", eventPushController.Delete)
 	}
-	pollCApi :=r.Group(urlPrefix+"/pollConfig")
+	pollCApi := r.Group(urlPrefix + "/pollConfig")
 	{
-		pollCApi.POST("/savePollPeriod",pollConfigController.SavePollPeriod)
-		pollCApi.POST("/savePollDelay",pollConfigController.SavePollDelay)
-		pollCApi.GET("/getPollConfig",pollConfigController.GetPollConfig)
-		pollCApi.POST("/updateEnable",pollConfigController.UpdateEnable)
+		pollCApi.POST("/savePollPeriod", pollConfigController.SavePollPeriod)
+		pollCApi.POST("/savePollDelay", pollConfigController.SavePollDelay)
+		pollCApi.GET("/getPollConfig", pollConfigController.GetPollConfig)
+		pollCApi.POST("/updateEnable", pollConfigController.UpdateEnable)
 	}
 
 	// 鏂囦欢 涓婁紶
 	r.Static("static", "./static") // 闈欐�佹枃浠�
 	//澶栭儴璁块棶swagger.json
 	r.StaticFile("/swagger.json", "./docs/swagger.json")
-
+	fileController := new(controllers.FileController)
 	vdbperson.POST("/fileupload", fileController.Fileupload)
 	vdbperson.POST("/moreFileUpload", fileController.MoreFileUpload)
 	r.POST(urlPrefix+"/es/ImageUploadReturnPics", fileController.ImageUploadReturnPics)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 5f2888f..dcf7455 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -21,13 +21,13 @@
 }
 
 const (
-	Ipc_Push_Ext = "_2.ipc"
-	Ipc_Pull_Ext = "_1.ipc"
-	Ipc_Url_Pre = "ipc:///tmp///"
+	Ipc_Push_Ext       = "_2.ipc"
+	Ipc_Pull_Ext       = "_1.ipc"
+	Ipc_Url_Pre        = "ipc:///tmp///"
 	Virtual_FaceTaskId = "92496BDF-2BFA-98F2-62E8-96DD9866ABD2"
-	Virtual_FaceSdkId = "virtual-faceextract-sdk-pull"
-	Url_Service_PUSH = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Push_Ext
-	Url_Service_PULL = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Pull_Ext
+	Virtual_FaceSdkId  = "virtual-faceextract-sdk-pull"
+	Url_Service_PUSH   = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Push_Ext
+	Url_Service_PULL   = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Pull_Ext
 )
 
 func NewFaceSdkService(file multipart.File) FaceSdkService{
@@ -89,18 +89,18 @@
 }
 
 func ImgCompress(i *protomsg.Image) ([]byte,error){
-	if b, err := proto.Marshal(i);err !=nil{
+	if b, err := proto.Marshal(i); err != nil {
 		fmt.Println("protoImage marshal err")
 		return nil,err
 	} else {
-		bc := make([]byte,len(b))
+		bc := make([]byte, len(b))
 		ht := make([]int, 64<<10)
-		n,err := lz4.CompressBlock(b, bc, ht)
-		if err !=nil {
+		n, err := lz4.CompressBlock(b, bc, ht)
+		if err != nil {
 			fmt.Println(err)
 			return nil,err
 		}
-		if n >= len(b){
+		if n >= len(b) {
 			fmt.Println("image is not compressible")
 			return nil,errors.New("compressed len is 0")
 		}
@@ -160,13 +160,13 @@
 	//gocv.IMWrite("xxx.jpg", wrMat)
 
 	i = protomsg.Image{
-		Width: width,
-		Height: height,
+		Width:     width,
+		Height:    height,
 		Timestamp: formatTimeStr,
-		Data: data,
-		Id: timeUnix,
+		Data:      data,
+		Id:        timeUnix,
 	}
-	i.Cid = uuid.NewV4().String()//鏁版嵁鍞竴id
+	i.Cid = uuid.NewV4().String() //鏁版嵁鍞竴id
 	fmt.Println("gocv read img completed")
 	return i
 }
@@ -177,11 +177,12 @@
 
 var resultMap map[string][]*protomsg.ResultFaceExtCom
 
-
-func InitService(){
+func InitService() {
 	fmt.Println("service init!")
 	imgPushChan = make(chan []byte)
+
 	resultMap = make(map[string][]*protomsg.ResultFaceExtCom,0)
+
 	client_push = deliver.NewClient(deliver.PushPull, Url_Service_PUSH)
 	client_pull = deliver.NewClient(deliver.PushPull, Url_Service_PULL)
 	defer func() {
@@ -193,14 +194,14 @@
 	go thRecv()
 }
 
-func thSend(){
+func thSend() {
 	for {
 		select {
-		case d := <- imgPushChan:
+		case d := <-imgPushChan:
 			fmt.Println("imgPushChan in")
 			err := client_push.Send(d)
-			if err !=nil {
-				fmt.Println("img Send err:",err)
+			if err != nil {
+				fmt.Println("img Send err:", err)
 			}
 		default:
 			//fmt.Println("no img in")
@@ -208,19 +209,20 @@
 	}
 }
 
-func thRecv(){
+func thRecv() {
 	for {
 		resultBytes, err := client_pull.Recv()
-		if err !=nil{
-			fmt.Println("pull err:",err)
+		if err != nil {
+			fmt.Println("pull err:", err)
 			continue
 		}
 		rMsg := protomsg.SdkMessage{}
-		if err := proto.Unmarshal(resultBytes, &rMsg);err ==nil{
-			fmt.Println("received MSG:",rMsg.Cid)
+		if err := proto.Unmarshal(resultBytes, &rMsg); err == nil {
+			fmt.Println("received MSG:", rMsg.Cid)
 			perId := rMsg.Cid //鏁版嵁id
-			if rMsg.Tasklab !=nil && rMsg.Tasklab.Taskid == Virtual_FaceTaskId {
+			if rMsg.Tasklab != nil && rMsg.Tasklab.Taskid == Virtual_FaceTaskId {
 				sdkInfos := rMsg.Tasklab.Sdkinfos
+
 				fmt.Println("Len(sdkInfos)=",len(sdkInfos))
 				for _,swt :=range sdkInfos{
 					if swt.Sdktype =="FaceDetect"{
@@ -257,8 +259,8 @@
 				}
 			}
 		} else {
-			fmt.Println("recv msg Err:",err)
+			fmt.Println("recv msg Err:", err)
 		}
 
 	}
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0