From 4c7890a506f95bfc8d06a75dbf6150bb8fcad1bb Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 28 九月 2019 15:28:32 +0800
Subject: [PATCH] add logger
---
controllers/user.go | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index b623193..cb0dadd 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,12 @@
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"]
+ tokenM["permissions"] = loginedM["permissions"]
+ tokenStr := (*authDriver).Login(c.Request, c.Writer, tokenM)
+ c.JSON(200,map[string]interface{}{
"userInfo":loginedM,
"access_token":tokenStr,
"refresh_token":tokenStr,
@@ -50,7 +55,7 @@
"expires_in":time.Now().Add(time.Hour * 8).Unix(),
})
} else {
- util.ResponseFormat(c,code.LoginInfoError,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")
+ c.JSON(500,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")
}
}
@@ -61,14 +66,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,9 +83,16 @@
// @Router /data/api-u/sys/logout [get]
func (uc UserController) Logout(c *gin.Context){
- util.ResponseFormat(c,code.LogoutSuccess,"閫�鍑烘垚鍔�")
+ c.JSON(http.StatusOK,"閫�鍑烘垚鍔�")
}
+// @Summary 鏌ユ壘鎵�鏈夌敤鎴�
+// @Description 鏌ユ壘鎵�鏈夌敤鎴�
+// @Accept json
+// @Produce json
+// @Tags 鐢ㄦ埛
+// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
+// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
// @Router /data/api-u/users/findAllUser [get]
func (uc UserController) FindAllUser(c *gin.Context) {
var api dbapi.UserApi
@@ -105,7 +117,7 @@
// @Accept json
// @Produce json
// @Tags 鐢ㄦ埛
-// @Param userVo body UserEditVo true "鐢ㄦ埛缂栬緫淇℃伅"
+// @Param userVo body controllers.UserEditVo true "鐢ㄦ埛缂栬緫淇℃伅"
// @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/edit [post]
--
Gitblit v1.8.0