From 3209578e098ad22876a997e9629bb0c01a137df2 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 05 七月 2019 19:30:30 +0800
Subject: [PATCH] test
---
controllers/user.go | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index 7ae9d62..c162890 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -2,6 +2,7 @@
import (
"basic.com/dbapi.git"
+ "encoding/json"
"fmt"
"github.com/gin-gonic/gin"
"time"
@@ -37,12 +38,16 @@
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)
+ b, _ := json.Marshal(loginedM["data"])
+ uMap :=make(map[string]interface{},0)
+ json.Unmarshal(b,uMap)
+ tokenStr := (*authDriver).Login(c.Request, c.Writer, uMap)
c.JSON(200,map[string]interface{}{
- "userInfo":userInfo,
+ "userInfo":uMap,
"access_token":tokenStr,
"refresh_token":tokenStr,
"scope":"app",
--
Gitblit v1.8.0