From 551df14cf2c5036009eb8bf0c4fd5c1ede2a682c Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 20 九月 2019 20:23:29 +0800
Subject: [PATCH] user edit
---
controllers/user.go | 64 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index 0f0b1e2..b623193 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -3,7 +3,6 @@
import (
"basic.com/dbapi.git"
"github.com/gin-gonic/gin"
- "net/http"
"time"
"webserver/extend/code"
"webserver/extend/util"
@@ -29,7 +28,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,7 @@
authDriver := auth.GenerateAuthDriver()
loginedM := util.Struct2Map(data)
tokenStr := (*authDriver).Login(c.Request, c.Writer, loginedM)
- c.JSON(200,map[string]interface{}{
+ util.ResponseFormat(c,code.Success,map[string]interface{}{
"userInfo":loginedM,
"access_token":tokenStr,
"refresh_token":tokenStr,
@@ -51,7 +50,7 @@
"expires_in":time.Now().Add(time.Hour * 8).Unix(),
})
} else {
- c.JSON(500,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")
+ util.ResponseFormat(c,code.LoginInfoError,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")
}
}
@@ -63,21 +62,66 @@
// @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) {
+func (uc UserController) Current(c *gin.Context) {
authDriver := auth.GenerateAuthDriver()
user := (*authDriver).User(c)
if user !=nil {
- c.JSON(http.StatusOK,user)
+ util.ResponseFormat(c,code.Success,user)
} else {
- c.JSON(http.StatusUnauthorized,"")
+ util.ResponseFormat(c,code.TokenNotFound,"")
}
}
// @Router /data/api-u/sys/refresh_token [post]
-func (controller UserController) RefreshToken(c *gin.Context){
+func (uc UserController) RefreshToken(c *gin.Context){
}
// @Router /data/api-u/sys/logout [get]
-func (controller UserController) Logout(c *gin.Context){
- c.JSON(http.StatusOK,"閫�鍑烘垚鍔�")
+func (uc UserController) Logout(c *gin.Context){
+ util.ResponseFormat(c,code.LogoutSuccess,"閫�鍑烘垚鍔�")
+}
+
+// @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 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