From e87b04d7f9d6b25c858d421432bed5443f91b9df Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 16 九月 2019 11:10:34 +0800
Subject: [PATCH] update goffmpeg and capture
---
controllers/user.go | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index c162890..0f0b1e2 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -2,9 +2,8 @@
import (
"basic.com/dbapi.git"
- "encoding/json"
- "fmt"
"github.com/gin-gonic/gin"
+ "net/http"
"time"
"webserver/extend/code"
"webserver/extend/util"
@@ -42,12 +41,9 @@
if flag {
authDriver := auth.GenerateAuthDriver()
loginedM := util.Struct2Map(data)
- b, _ := json.Marshal(loginedM["data"])
- uMap :=make(map[string]interface{},0)
- json.Unmarshal(b,uMap)
- tokenStr := (*authDriver).Login(c.Request, c.Writer, uMap)
+ tokenStr := (*authDriver).Login(c.Request, c.Writer, loginedM)
c.JSON(200,map[string]interface{}{
- "userInfo":uMap,
+ "userInfo":loginedM,
"access_token":tokenStr,
"refresh_token":tokenStr,
"scope":"app",
@@ -70,14 +66,18 @@
func (controller UserController) Current(c *gin.Context) {
authDriver := auth.GenerateAuthDriver()
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){
+}
+
+// @Router /data/api-u/sys/logout [get]
func (controller UserController) Logout(c *gin.Context){
-
+ c.JSON(http.StatusOK,"閫�鍑烘垚鍔�")
}
\ No newline at end of file
--
Gitblit v1.8.0