From e83dc9c5ecbcc4f97da67f6fb5a1a352e0c9efb9 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 08 七月 2019 19:36:01 +0800
Subject: [PATCH] gb28181set
---
controllers/user.go | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index 7ae9d62..48a3121 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -4,6 +4,7 @@
"basic.com/dbapi.git"
"fmt"
"github.com/gin-gonic/gin"
+ "net/http"
"time"
"webserver/extend/code"
"webserver/extend/util"
@@ -37,12 +38,13 @@
return
}
var api dbapi.UserApi
- flag, userInfo := api.Login(userName, password)
+ flag, data := api.Login(userName, password)
if flag {
authDriver := auth.GenerateAuthDriver()
- tokenStr := (*authDriver).Login(c.Request, c.Writer, util.Struct2Map(userInfo))
+ loginedM := util.Struct2Map(data)
+ tokenStr := (*authDriver).Login(c.Request, c.Writer, loginedM)
c.JSON(200,map[string]interface{}{
- "userInfo":userInfo,
+ "userInfo":loginedM,
"access_token":tokenStr,
"refresh_token":tokenStr,
"scope":"app",
@@ -67,11 +69,15 @@
user := (*authDriver).User(c)
fmt.Println("current:",user)
if user !=nil {
- util.ResponseFormat(c,code.Success,user)
+ c.JSON(http.StatusOK,user)
} else {
- util.ResponseFormat(c,code.NotLogin,"")
+ c.JSON(http.StatusUnauthorized,"")
}
}
+// @Router /data/api-u/sys/refresh_token [post]
+func (controller UserController) RefreshToken(c *gin.Context){
+
+}
func (controller UserController) Logout(c *gin.Context){
--
Gitblit v1.8.0