From 5554c2b0ce78145c7932e94d1d9b8c00b2208ec6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 21 九月 2019 14:25:41 +0800
Subject: [PATCH] token decrease

---
 controllers/user.go |   76 ++++++++++++++++++++++++++++++++------
 1 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/controllers/user.go b/controllers/user.go
index 7ae9d62..f473545 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -2,7 +2,6 @@
 
 import (
 	"basic.com/dbapi.git"
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"time"
 	"webserver/extend/code"
@@ -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 == "" {
@@ -37,12 +36,16 @@
 		return
 	}
 	var api dbapi.UserApi
-	flag, userInfo := api.Login(userName, password)
+	flag, data := api.Login(userName, password)
 	if flag {
 		authDriver := auth.GenerateAuthDriver()
-		tokenStr := (*authDriver).Login(c.Request, c.Writer, util.Struct2Map(userInfo))
-		c.JSON(200,map[string]interface{}{
-			"userInfo":userInfo,
+		loginedM := util.Struct2Map(data)
+		tokenM := make(map[string]interface{},2)
+		tokenM["id"] = loginedM["id"]
+		tokenM["username"] = loginedM["username"]
+		tokenStr := (*authDriver).Login(c.Request, c.Writer, tokenM)
+		util.ResponseFormat(c,code.Success,map[string]interface{}{
+			"userInfo":loginedM,
 			"access_token":tokenStr,
 			"refresh_token":tokenStr,
 			"scope":"app",
@@ -50,7 +53,7 @@
 			"expires_in":time.Now().Add(time.Hour * 8).Unix(),
 		})
 	} else {
-		c.JSON(500,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")
+		util.ResponseFormat(c,code.LoginInfoError,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")
 	}
 }
 
@@ -61,18 +64,67 @@
 // @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 {
 		util.ResponseFormat(c,code.Success,user)
 	} else {
-		util.ResponseFormat(c,code.NotLogin,"")
+		util.ResponseFormat(c,code.TokenNotFound,"")
+	}
+}
+// @Router /data/api-u/sys/refresh_token [post]
+func (uc UserController) RefreshToken(c *gin.Context){
+
+}
+
+// @Router /data/api-u/sys/logout [get]
+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,"")
 	}
 }
 
-func (controller UserController) Logout(c *gin.Context){
+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