From 8ccbba8c091af896a965a0f9e6c526b73e57c244 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 21 九月 2019 14:44:34 +0800
Subject: [PATCH] login,current,logout use c.JSON
---
controllers/user.go | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index b623193..8417d46 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -3,6 +3,7 @@
import (
"basic.com/dbapi.git"
"github.com/gin-gonic/gin"
+ "net/http"
"time"
"webserver/extend/code"
"webserver/extend/util"
@@ -40,8 +41,11 @@
if flag {
authDriver := auth.GenerateAuthDriver()
loginedM := util.Struct2Map(data)
- tokenStr := (*authDriver).Login(c.Request, c.Writer, loginedM)
- util.ResponseFormat(c,code.Success,map[string]interface{}{
+ tokenM := make(map[string]interface{},2)
+ tokenM["id"] = loginedM["id"]
+ tokenM["username"] = loginedM["username"]
+ tokenStr := (*authDriver).Login(c.Request, c.Writer, tokenM)
+ c.JSON(200,map[string]interface{}{
"userInfo":loginedM,
"access_token":tokenStr,
"refresh_token":tokenStr,
@@ -50,7 +54,7 @@
"expires_in":time.Now().Add(time.Hour * 8).Unix(),
})
} else {
- util.ResponseFormat(c,code.LoginInfoError,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")
+ c.JSON(500,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")
}
}
@@ -61,14 +65,14 @@
// @Tags 鐢ㄦ埛
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
// @Failure 500 {string} json "{"code":500, success:false, msg:"", data:""}"
-// @Router /data/api-v/users/current [get]
+// @Router /data/api-u/users/current [get]
func (uc UserController) Current(c *gin.Context) {
authDriver := auth.GenerateAuthDriver()
user := (*authDriver).User(c)
if user !=nil {
- util.ResponseFormat(c,code.Success,user)
+ c.JSON(http.StatusOK,user)
} else {
- util.ResponseFormat(c,code.TokenNotFound,"")
+ c.JSON(http.StatusUnauthorized,"")
}
}
// @Router /data/api-u/sys/refresh_token [post]
@@ -78,7 +82,7 @@
// @Router /data/api-u/sys/logout [get]
func (uc UserController) Logout(c *gin.Context){
- util.ResponseFormat(c,code.LogoutSuccess,"閫�鍑烘垚鍔�")
+ c.JSON(http.StatusOK,"閫�鍑烘垚鍔�")
}
// @Router /data/api-u/users/findAllUser [get]
--
Gitblit v1.8.0