From dea5314d2564b6b0693c5ca360af8fe8cf72e66c Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 05 七月 2019 19:42:23 +0800
Subject: [PATCH] fix bug
---
controllers/user.go | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index 693efb6..1416f9f 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -4,7 +4,7 @@
"basic.com/dbapi.git"
"fmt"
"github.com/gin-gonic/gin"
- "github.com/gin-gonic/gin/internal/json"
+ "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,9 +69,9 @@
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,"")
}
}
--
Gitblit v1.8.0