From a527225f7f3cc93882aa870c20f0985d07d6fe92 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期四, 22 八月 2019 18:12:03 +0800
Subject: [PATCH] set yn main port 7100
---
controllers/user.go | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index 7ae9d62..d12deff 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -2,8 +2,8 @@
import (
"basic.com/dbapi.git"
- "fmt"
"github.com/gin-gonic/gin"
+ "net/http"
"time"
"webserver/extend/code"
"webserver/extend/util"
@@ -37,12 +37,13 @@
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))
+ loginedM := util.Struct2Map(data)
+ tokenStr := (*authDriver).Login(c.Request, c.Writer, loginedM)
c.JSON(200,map[string]interface{}{
- "userInfo":userInfo,
+ "userInfo":loginedM,
"access_token":tokenStr,
"refresh_token":tokenStr,
"scope":"app",
@@ -65,14 +66,22 @@
func (controller 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)
+ c.JSON(http.StatusOK,user)
} else {
- util.ResponseFormat(c,code.NotLogin,"")
+ c.JSON(http.StatusUnauthorized,"")
}
}
+/*
+// @Router /data/api-u/sys/refresh_token [post]
+*/
+func (controller UserController) RefreshToken(c *gin.Context){
+}
+
+/*
+// @Router /data/api-u/sys/logout [get]
+*/
func (controller UserController) Logout(c *gin.Context){
-
+ c.JSON(http.StatusOK,"閫�鍑烘垚鍔�")
}
\ No newline at end of file
--
Gitblit v1.8.0