From 31f3e1964a37efc54f42ccaad91662ceb569c8f6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 31 十月 2019 19:10:19 +0800
Subject: [PATCH] update protomsg
---
controllers/fileController.go | 6 +-----
middlewares/auth/auth.go | 2 --
go.sum | 4 ++--
go.mod | 2 +-
4 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index d692755..4e596a1 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -300,10 +300,6 @@
isAlarmInt, _ := strconv.Atoi(vp.IsAlarm)
var bi []DbPersonVo
for _,p :=range vp.BaseInfo {
- if p.TableName == "鍏徃浜哄憳鏂�" {
- logger.Debug("FillData p.BwType:",p.BwType)
- }
-
bi = append(bi, DbPersonVo{
PersonId: p.PersonId,
IdCard: p.IdCard,
@@ -314,7 +310,7 @@
PhoneNum: p.PhoneNum,
Sex: p.Sex,
TableId: p.TableId,
- BwType: strconv.Itoa(int(p.BwType)),
+ BwType: p.BwType,
TableName: p.TableName,
})
}
diff --git a/go.mod b/go.mod
index b588e7a..7b90e77 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@
basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b // indirect
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 // indirect
basic.com/pubsub/esutil.git v0.0.0-20191031013312-2128f2f89a4b // indirect
- basic.com/pubsub/protomsg.git v0.0.0-20191031013101-edd40582998e // indirect
+ basic.com/pubsub/protomsg.git v0.0.0-20191031110456-1a84b09fbcd1 // indirect
basic.com/valib/capture.git v0.0.0-20190924061718-7e98d8c98b3c // indirect
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
basic.com/valib/goffmpeg.git v0.0.0-20191024085028-080acae08ec8 // indirect
diff --git a/go.sum b/go.sum
index 82d7c8b..c6ffa3d 100644
--- a/go.sum
+++ b/go.sum
@@ -8,8 +8,8 @@
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
basic.com/pubsub/esutil.git v0.0.0-20191031013312-2128f2f89a4b h1:Zou6YQlkM5lgeZ2p0XYQuVC4dUS9fONDBu2sc/Q4OW8=
basic.com/pubsub/esutil.git v0.0.0-20191031013312-2128f2f89a4b/go.mod h1:yIvppFPFGC61DOdm71ujnsxZBMFUu2yKjr5O43bMWCw=
-basic.com/pubsub/protomsg.git v0.0.0-20191031013101-edd40582998e h1:/Rgz71+dMOa6Ge/TwwiasnZzP5WZ6LG7v9WbEsJQCxs=
-basic.com/pubsub/protomsg.git v0.0.0-20191031013101-edd40582998e/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20191031110456-1a84b09fbcd1 h1:w/hlV2znPkwQxusqH8IIeg8+O3DPkCbRhsVKi6GdckU=
+basic.com/pubsub/protomsg.git v0.0.0-20191031110456-1a84b09fbcd1/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/capture.git v0.0.0-20190924061718-7e98d8c98b3c h1:aNujtcGxq0cNLSK08cCamAiUYiQ2/ZsUMNXbX2w8Clc=
basic.com/valib/capture.git v0.0.0-20190924061718-7e98d8c98b3c/go.mod h1:y+h7VUnoSQ3jOtf2K3twXNA8fYDfyUsifSswcyKLgNw=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
diff --git a/middlewares/auth/auth.go b/middlewares/auth/auth.go
index 2de927d..7df2c82 100644
--- a/middlewares/auth/auth.go
+++ b/middlewares/auth/auth.go
@@ -1,7 +1,6 @@
package auth
import (
- "fmt"
"github.com/gin-gonic/gin"
"net/http"
"strings"
@@ -64,7 +63,6 @@
c.Abort()
}
user := (*jwtDriver).User(c)
- fmt.Println("AuthHandler user:",user)
if user == nil {
util.ResponseFormat(c,code.TokenNotFound,"灏氭湭鐧诲綍锛岃鐧诲綍")
c.Abort()
--
Gitblit v1.8.0