From ebe954dab1f8a58d86a0282960591acb05cee479 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 05 七月 2019 19:15:04 +0800
Subject: [PATCH] fix bug
---
/dev/null | 15 ---------------
controllers/user.go | 2 +-
2 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index 7ae9d62..8286562 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -42,7 +42,7 @@
authDriver := auth.GenerateAuthDriver()
tokenStr := (*authDriver).Login(c.Request, c.Writer, util.Struct2Map(userInfo))
c.JSON(200,map[string]interface{}{
- "userInfo":userInfo,
+ "userInfo":userInfo.(map[string]interface{})["data"],
"access_token":tokenStr,
"refresh_token":tokenStr,
"scope":"app",
diff --git a/models/localconfig.go b/models/localconfig.go
deleted file mode 100644
index bc602fa..0000000
--- a/models/localconfig.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package models
-
-//type LocalConfig struct {
-// ID int `json:"-"`
-// Alarm_ip string `json:"alarm_ip,omitempty" example:"192.168.1.182"`
-// Alarm_port int `json:"alarm_port,omitempty" example:"22122"`
-// Web_pic_ip string `json:"web_pic_ip,omitempty" example:""`
-// Web_pic_port int `json:"web_pic_port,omitempty" example:"22122"`
-// Es_pic_ip string `json:"es_pic_ip,omitempty" example:""`
-// Es_pic_port int `json:"es_pic_port,omitempty" example:"22122"`
-// Cut_max_duration int `json:"cut_max_duration,omitempty" example:"20"`
-// Cut_min_duration int `json:"cut_min_duration,omitempty" example:"5"`
-// Dev_id string `json:"dev_id,omitempty" example:"鍒嗘瀽璁惧id"`
-// Dev_name string `json:"dev_name,omitempty" example:"鍒嗘瀽璁惧鍚嶇О"`
-// Dev_type int `json:"dev_type,omitempty" example:"1"`
-// Reserved string `json:"dev_type,omitempty" example:"1"`
-//}
\ No newline at end of file
diff --git a/models/vssLocalSettingTbl.go b/models/vssLocalSettingTbl.go
deleted file mode 100644
index 1e44700..0000000
--- a/models/vssLocalSettingTbl.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package models
-
-//import (
-// "time"
-//)
-//
-//type VSSLocalSettingTbl struct {
-// ID int `json:"ID,omitempty" gorm:"primary_key" `
-// ServerIp string `json:"ServerIp,omitempty" example:"SIP鏈嶅姟鍣↖P" gorm:"column:ServerIp"`
-// ServerPort int `json:"ServerPort,omitempty" example:"21231" gorm:"column:ServerPort"`
-// ServerId string `json:"ServerId,omitempty" example:"SIP鏈嶅姟鍣↖d" gorm:"column:ServerId"`
-// UserAuthId string `json:"UserAuthId,omitempty" example:"SIP鐢ㄦ埛璁よ瘉ID" gorm:"column:UserAuthId"`
-// Password string `json:"Password,omitempty" example:"瀵嗙爜" gorm:"column:Password"`
-// UpdateTime time.Time `json:"-" gorm:"column:UpdateTime"`
-//}
\ No newline at end of file
--
Gitblit v1.8.0