From 936be93b83a8799a8400b2f1b49f1710eef6ce51 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 05 七月 2019 19:15:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
controllers/user.go | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/controllers/user.go b/controllers/user.go
index 1763a51..8286562 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -41,8 +41,8 @@
if flag {
authDriver := auth.GenerateAuthDriver()
tokenStr := (*authDriver).Login(c.Request, c.Writer, util.Struct2Map(userInfo))
- util.ResponseFormat(c,code.LoginSuccess,map[string]interface{}{
- "userInfo":userInfo,
+ c.JSON(200,map[string]interface{}{
+ "userInfo":userInfo.(map[string]interface{})["data"],
"access_token":tokenStr,
"refresh_token":tokenStr,
"scope":"app",
@@ -50,7 +50,7 @@
"expires_in":time.Now().Add(time.Hour * 8).Unix(),
})
} else {
- util.ResponseFormat(c,code.SigninInfoError,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")
+ c.JSON(500,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")
}
}
--
Gitblit v1.8.0