From 2138cf8241c103ce454f38086fdfff27ede88e86 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 25 十月 2019 16:57:16 +0800
Subject: [PATCH] save user auth
---
controllers/user.go | 51 ++++++++++++++++++++-----
go.sum | 4 +-
go.mod | 2
controllers/sysMenu.go | 26 ++++++++++--
router/router.go | 3 +
5 files changed, 66 insertions(+), 20 deletions(-)
diff --git a/controllers/sysMenu.go b/controllers/sysMenu.go
index bcd500a..5fe7f17 100644
--- a/controllers/sysMenu.go
+++ b/controllers/sysMenu.go
@@ -35,13 +35,29 @@
}
}
+// @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-v/menu/tree [get]
func (smc SysMenuController) MenuTree(c *gin.Context) {
- var api dbapi.SysMenuApi
- d,err := api.MenuTree()
- if err ==nil {
- util.ResponseFormat(c,code.Success,d)
+ authDriver := auth.GenerateAuthDriver()
+ user := (*authDriver).User(c)
+ logger.Debug("current:",user)
+ if user != nil {
+ userM := user.(map[string]interface{})
+ userId := userM["id"].(string)
+ var api dbapi.SysMenuApi
+ d,err := api.MenuTree(userId)
+ if err ==nil {
+ util.ResponseFormat(c,code.Success,d)
+ } else {
+ util.ResponseFormat(c,code.ComError,"")
+ }
} else {
- util.ResponseFormat(c,code.ComError,"")
+ util.ResponseFormat(c,code.NotLogin,"璇风櫥褰�")
}
}
\ No newline at end of file
diff --git a/controllers/user.go b/controllers/user.go
index 4aa91b6..cc19fb0 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -2,6 +2,7 @@
import (
"basic.com/dbapi.git"
+ "basic.com/valib/logger.git"
"github.com/gin-gonic/gin"
"net/http"
"time"
@@ -95,8 +96,13 @@
// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
// @Router /data/api-u/users/findAllUser [get]
func (uc UserController) FindAllUser(c *gin.Context) {
+ authDriver := auth.GenerateAuthDriver()
+ user := (*authDriver).User(c)
+ logger.Debug("cur userInfo:",user)
+ loginM := user.(map[string]interface{})
+ userId := loginM["id"].(string)
var api dbapi.UserApi
- b,d := api.FindAllUser()
+ b,d := api.FindAllUser(userId)
if b {
util.ResponseFormat(c,code.Success,d)
} else {
@@ -107,33 +113,56 @@
type UserEditVo struct {
Id string `json:"id"`
UserName string `json:"username"`
- OldPwd string `json:"oldPwd"`
NewPwd string `json:"newPwd"`
- RoleIds []string `json:"roleIds"`
+ MenuIds []string `json:"menuIds"`
}
-// @Summary 鏇存柊鐢ㄦ埛鍚嶏紝瀵嗙爜鍜岃鑹叉潈闄�
-// @Description 鏇存柊鐢ㄦ埛鍚嶏紝瀵嗙爜鍜岃鑹叉潈闄�
+// @Summary 缂栬緫姝ょ敤鎴凤紝杩斿洖姝ょ敤鎴风殑鏉冮檺鑿滃崟
+// @Description 缂栬緫姝ょ敤鎴凤紝杩斿洖姝ょ敤鎴风殑鏉冮檺鑿滃崟
// @Accept json
// @Produce json
// @Tags 鐢ㄦ埛
-// @Param userVo body controllers.UserEditVo true "鐢ㄦ埛缂栬緫淇℃伅"
+// @Param userId formData string true "鐢ㄦ埛id"
// @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/edit [post]
-func (uc UserController) Edit(c *gin.Context) {
+// @Router /data/api-u/users/findById [post]
+func (uc UserController) FindById(c *gin.Context) {
+ userId := c.PostForm("userId")
+ if userId == "" {
+ util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+ return
+ }
+ var api dbapi.UserApi
+ b, d := api.FindById(userId)
+ if b {
+ util.ResponseFormat(c,code.Success,d)
+ } else {
+ util.ResponseFormat(c,code.ComError,"")
+ }
+}
+
+// @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/user/saveAuth [post]
+func (uc UserController) SaveAuth(c *gin.Context) {
var userEditVo UserEditVo
err := c.BindJSON(&userEditVo)
- if err !=nil || userEditVo.Id =="" || userEditVo.OldPwd == "" || userEditVo.NewPwd =="" || userEditVo.UserName == "" {
+ if err !=nil || userEditVo.Id =="" || userEditVo.NewPwd =="" || userEditVo.UserName == "" {
util.ResponseFormat(c,code.RequestParamError,"")
return
}
paramBody := util.Struct2Map(userEditVo)
var api dbapi.UserApi
- b,d := api.Edit(paramBody)
+ b, d := api.SaveAuth(paramBody)
if b {
util.ResponseFormat(c,code.UpdateSuccess,d)
} else {
- util.ResponseFormat(c,code.UpdateFail,"鏇存柊澶辫触")
+ util.ResponseFormat(c,code.UpdateFail,"淇濆瓨澶辫触")
}
}
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 6eb67a6..d688aa3 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@
go 1.12
require (
- basic.com/dbapi.git v0.0.0-20191019114327-d8d991f239fb // indirect
+ basic.com/dbapi.git v0.0.0-20191025084729-a04db890e7b5 // indirect
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb // indirect
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 // indirect
basic.com/pubsub/esutil.git v0.0.0-20190807083318-4431a8860d47
diff --git a/go.sum b/go.sum
index 3f6e1c3..907eb2b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-basic.com/dbapi.git v0.0.0-20191019114327-d8d991f239fb h1:3E8uHd/YWHA4M8ryCy+Cj7AI/r7cBEv8W8fCQJeMMOY=
-basic.com/dbapi.git v0.0.0-20191019114327-d8d991f239fb/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
+basic.com/dbapi.git v0.0.0-20191025084729-a04db890e7b5 h1:OcZOgjBXfzhI1Ukxblacxu5xwKl448ADYyulJ02zdb8=
+basic.com/dbapi.git v0.0.0-20191025084729-a04db890e7b5/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb h1:fM6DojeInFSCFO+wkba1jtyPiSDqw0jYKi4Tk+e+ka4=
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb/go.mod h1:FTryK8BsVLfUplx8a3+l8hJWub6VbAWZCUH7sPRZaso=
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 h1:BBA30Rgljn6MRieC4gUncETJDyna3ObyubTo9HEQ2M0=
diff --git a/router/router.go b/router/router.go
index 02584e1..ddde8ee 100644
--- a/router/router.go
+++ b/router/router.go
@@ -62,7 +62,8 @@
{
userApi.GET("/current", userController.Current)
userApi.GET("/findAllUser", userController.FindAllUser)
- userApi.POST("/edit", userController.Edit)
+ userApi.POST("/findById", userController.FindById)
+ userApi.POST("/saveAuth", userController.SaveAuth)
}
urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
--
Gitblit v1.8.0