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 | 73 +++++++++++++++++++++++++++++++++---
1 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index 1416f9f..cb0dadd 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -2,7 +2,6 @@
import (
"basic.com/dbapi.git"
- "fmt"
"github.com/gin-gonic/gin"
"net/http"
"time"
@@ -30,7 +29,7 @@
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
// @Failure 500 {string} json "{"code":500, success:false, msg:"", data:""}"
// @Router /data/api-v/sys/login [post]
-func (controller UserController) Login(c *gin.Context) {
+func (uc UserController) Login(c *gin.Context) {
userName := c.PostForm("username")
password := c.PostForm("password")
if userName == "" || password == "" {
@@ -42,7 +41,11 @@
if flag {
authDriver := auth.GenerateAuthDriver()
loginedM := util.Struct2Map(data)
- tokenStr := (*authDriver).Login(c.Request, c.Writer, loginedM)
+ 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,
@@ -63,18 +66,74 @@
// @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]
-func (controller UserController) Current(c *gin.Context) {
+// @Router /data/api-u/users/current [get]
+func (uc UserController) Current(c *gin.Context) {
authDriver := auth.GenerateAuthDriver()
user := (*authDriver).User(c)
- fmt.Println("current:",user)
if user !=nil {
c.JSON(http.StatusOK,user)
} else {
c.JSON(http.StatusUnauthorized,"")
}
}
+// @Router /data/api-u/sys/refresh_token [post]
+func (uc UserController) RefreshToken(c *gin.Context){
-func (controller UserController) Logout(c *gin.Context){
+}
+// @Router /data/api-u/sys/logout [get]
+func (uc UserController) Logout(c *gin.Context){
+ 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
+ b,d := api.FindAllUser()
+ if b {
+ util.ResponseFormat(c,code.Success,d)
+ } else {
+ util.ResponseFormat(c,code.ComError,"")
+ }
+}
+
+type UserEditVo struct {
+ Id string `json:"id"`
+ UserName string `json:"username"`
+ OldPwd string `json:"oldPwd"`
+ NewPwd string `json:"newPwd"`
+ RoleIds []string `json:"roleIds"`
+}
+
+// @Summary 鏇存柊鐢ㄦ埛鍚嶏紝瀵嗙爜鍜岃鑹叉潈闄�
+// @Description 鏇存柊鐢ㄦ埛鍚嶏紝瀵嗙爜鍜岃鑹叉潈闄�
+// @Accept json
+// @Produce json
+// @Tags 鐢ㄦ埛
+// @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]
+func (uc UserController) Edit(c *gin.Context) {
+ var userEditVo UserEditVo
+ err := c.BindJSON(&userEditVo)
+ if err !=nil || userEditVo.Id =="" || userEditVo.OldPwd == "" || userEditVo.NewPwd =="" || userEditVo.UserName == "" {
+ util.ResponseFormat(c,code.RequestParamError,"")
+ return
+ }
+ paramBody := util.Struct2Map(userEditVo)
+ var api dbapi.UserApi
+ b,d := api.Edit(paramBody)
+ if b {
+ util.ResponseFormat(c,code.UpdateSuccess,d)
+ } else {
+ util.ResponseFormat(c,code.UpdateFail,"鏇存柊澶辫触")
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0