From 00c6fb6a7196832f46bbce513b58bc6d9a3c9fa5 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 23 七月 2019 19:29:03 +0800
Subject: [PATCH] add permissions

---
 controllers/user.go |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/controllers/user.go b/controllers/user.go
index c162890..9212b41 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -2,9 +2,9 @@
 
 import (
 	"basic.com/dbapi.git"
-	"encoding/json"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"net/http"
 	"time"
 	"webserver/extend/code"
 	"webserver/extend/util"
@@ -42,12 +42,9 @@
 	if flag {
 		authDriver := auth.GenerateAuthDriver()
 		loginedM := util.Struct2Map(data)
-		b, _ := json.Marshal(loginedM["data"])
-		uMap :=make(map[string]interface{},0)
-		json.Unmarshal(b,uMap)
-		tokenStr := (*authDriver).Login(c.Request, c.Writer, uMap)
+		tokenStr := (*authDriver).Login(c.Request, c.Writer, loginedM)
 		c.JSON(200,map[string]interface{}{
-			"userInfo":uMap,
+			"userInfo":loginedM,
 			"access_token":tokenStr,
 			"refresh_token":tokenStr,
 			"scope":"app",
@@ -72,12 +69,17 @@
 	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