From d42b09cda8b2bc58c43c200f3aabdb0b2a7e9211 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 12 七月 2019 12:02:14 +0800
Subject: [PATCH] fix search controllers
---
controllers/user.go | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index a406775..48a3121 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -2,7 +2,10 @@
import (
"basic.com/dbapi.git"
+ "fmt"
"github.com/gin-gonic/gin"
+ "net/http"
+ "time"
"webserver/extend/code"
"webserver/extend/util"
"webserver/middlewares/auth"
@@ -22,26 +25,60 @@
// @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/user/login [post]
+// @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, data := api.Login(userName, password)
if flag {
authDriver := auth.GenerateAuthDriver()
- tokenStr := (*authDriver).Login(c.Request, c.Writer, util.Struct2Map(userInfo))
- util.ResponseFormat(c,code.Success,map[string]interface{}{
- "userInfo":userInfo,
- "token":tokenStr,
+ loginedM := util.Struct2Map(data)
+ tokenStr := (*authDriver).Login(c.Request, c.Writer, loginedM)
+ c.JSON(200,map[string]interface{}{
+ "userInfo":loginedM,
+ "access_token":tokenStr,
+ "refresh_token":tokenStr,
+ "scope":"app",
+ "token_type":"Bearer",
+ "expires_in":time.Now().Add(time.Hour * 8).Unix(),
})
} else {
- util.ResponseFormat(c,code.SigninInfoError,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")
+ c.JSON(500,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")
}
+}
+
+// @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/users/current [get]
+func (controller UserController) Current(c *gin.Context) {
+ authDriver := auth.GenerateAuthDriver()
+ user := (*authDriver).User(c)
+ fmt.Println("current:",user)
+ if user !=nil {
+ c.JSON(http.StatusOK,user)
+ } else {
+ c.JSON(http.StatusUnauthorized,"")
+ }
+}
+// @Router /data/api-u/sys/refresh_token [post]
+func (controller UserController) RefreshToken(c *gin.Context){
+
+}
+
+func (controller UserController) Logout(c *gin.Context){
+
}
\ No newline at end of file
--
Gitblit v1.8.0