From d21de749cc7028a802ec413f47e866b1e13f033e Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 04 七月 2019 11:51:42 +0800
Subject: [PATCH] fix bug
---
controllers/user.go | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index e57b4e3..7ae9d62 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -24,22 +24,24 @@
// @Accept json
// @Produce json
// @Tags 鐢ㄦ埛
-// @Param user body UserVo true "鐢ㄦ埛淇℃伅"
+// @Param username query string true "鐢ㄦ埛鍚�"
+// @Param password query 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) {
- var userVo UserVo
- if err := c.BindJSON(&userVo);err !=nil {
+ userName := c.PostForm("username")
+ password := c.PostForm("password")
+ if userName == "" || password == "" {
util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
return
}
var api dbapi.UserApi
- flag, userInfo := api.Login(userVo.UserName, userVo.Password)
+ flag, userInfo := api.Login(userName, password)
if flag {
authDriver := auth.GenerateAuthDriver()
tokenStr := (*authDriver).Login(c.Request, c.Writer, util.Struct2Map(userInfo))
- util.ResponseFormat(c,code.LoginSuccess,map[string]interface{}{
+ c.JSON(200,map[string]interface{}{
"userInfo":userInfo,
"access_token":tokenStr,
"refresh_token":tokenStr,
@@ -48,7 +50,7 @@
"expires_in":time.Now().Add(time.Hour * 8).Unix(),
})
} else {
- util.ResponseFormat(c,code.SigninInfoError,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")
+ c.JSON(500,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")
}
}
--
Gitblit v1.8.0