From f26a0cab5bca17b7eab57f6330e576271e17a17f Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:12:08 +0800
Subject: [PATCH] update ynSwagger,sync to master
---
controllers/user.go | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 106 insertions(+), 8 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index d12deff..4ce48d1 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -21,15 +21,15 @@
// @Summary 鐢ㄦ埛鐧诲綍
// @Description 鐢ㄦ埛鐧诲綍
-// @Accept json
+// @Accept x-www-form-urlencoded
// @Produce json
// @Tags 鐢ㄦ埛
-// @Param username query string true "鐢ㄦ埛鍚�"
-// @Param password query string true "瀵嗙爜"
+// @Param username formData string true "鐢ㄦ埛鍚�"
+// @Param password formData string 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/sys/login [post]
-func (controller UserController) Login(c *gin.Context) {
+// @Router /data/api-u/sys/login [post]
+func (uc UserController) Login(c *gin.Context) {
userName := c.PostForm("username")
password := c.PostForm("password")
if userName == "" || password == "" {
@@ -41,7 +41,16 @@
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)
+
+
+ userId := loginedM["id"].(string)
+ auth.RemoveOutUser(userId)
+
c.JSON(200,map[string]interface{}{
"userInfo":loginedM,
"access_token":tokenStr,
@@ -55,6 +64,7 @@
}
}
+// @Security ApiKeyAuth
// @Summary 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
// @Description 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
// @Accept json
@@ -62,8 +72,8 @@
// @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)
if user !=nil {
@@ -84,4 +94,92 @@
*/
func (controller UserController) Logout(c *gin.Context){
c.JSON(http.StatusOK,"閫�鍑烘垚鍔�")
+}
+
+/*
+// @Security ApiKeyAuth
+// @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) {
+ authDriver := auth.GenerateAuthDriver()
+ userM := (*authDriver).User(c)
+ userId := userM["id"].(string)
+ var api dbapi.UserApi
+ b,d := api.FindAllUser(userId)
+ 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"`
+ NewPwd string `json:"newPwd"`
+ MenuIds []string `json:"menuIds"`
+}
+
+/*
+// @Security ApiKeyAuth
+// @Summary 缂栬緫姝ょ敤鎴凤紝杩斿洖姝ょ敤鎴风殑鏉冮檺鑿滃崟
+// @Description 缂栬緫姝ょ敤鎴凤紝杩斿洖姝ょ敤鎴风殑鏉冮檺鑿滃崟
+// @Accept x-www-form-urlencoded
+// @Produce json
+// @Tags 鐢ㄦ埛
+// @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/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,"")
+ }
+}
+
+/*
+// @Security ApiKeyAuth
+// @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.UserName == "" {
+ util.ResponseFormat(c,code.RequestParamError,"")
+ return
+ }
+ paramBody := util.Struct2Map(userEditVo)
+ var api dbapi.UserApi
+ b, d := api.SaveAuth(paramBody)
+ if b {
+ auth.SetOutUser(userEditVo.Id)
+ util.ResponseFormat(c,code.UpdateSuccess,d)
+ } else {
+ util.ResponseFormat(c,code.UpdateFail,"淇濆瓨澶辫触")
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0