From 2ae2c9b784a7bfd6295b194f51acb8e1375b5f7f Mon Sep 17 00:00:00 2001
From: HFO4 <912394456@qq.com>
Date: Tue, 12 Nov 2019 13:55:33 +0800
Subject: [PATCH] Modify: using memstore to store session

---
 middleware/session.go |  4 ++--
 models/user.go        | 10 +++++-----
 service/user/login.go |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/middleware/session.go b/middleware/session.go
index 2dd8416..8c26aa9 100644
--- a/middleware/session.go
+++ b/middleware/session.go
@@ -2,13 +2,13 @@ package middleware
 
 import (
 	"github.com/gin-contrib/sessions"
-	"github.com/gin-contrib/sessions/cookie"
+	"github.com/gin-contrib/sessions/memstore"
 	"github.com/gin-gonic/gin"
 )
 
 // Session 初始化session
 func Session(secret string) gin.HandlerFunc {
-	store := cookie.NewStore([]byte(secret))
+	store := memstore.NewStore([]byte(secret))
 	//Also set Secure: true if using SSL, you should though
 	store.Options(sessions.Options{HttpOnly: true, MaxAge: 7 * 86400, Path: "/"})
 	return sessions.Sessions("cloudreve-session", store)
diff --git a/models/user.go b/models/user.go
index 1c055c8..4f9329f 100644
--- a/models/user.go
+++ b/models/user.go
@@ -26,18 +26,18 @@ type User struct {
 	gorm.Model
 	Email             string `gorm:"type:varchar(100);unique_index"`
 	Nick              string `gorm:"size:50"`
-	Password          string
+	Password          string `json:"-"`
 	Status            int
 	Group             int
 	PrimaryGroup      int
-	ActivationKey     string
+	ActivationKey     string `json:"-"`
 	Storage           int64
 	LastNotify        *time.Time
-	OpenID            string
-	TwoFactor         string
+	OpenID            string `json:"-"`
+	TwoFactor         string `json:"-"`
 	Delay             int
 	Avatar            string
-	Options           string                `gorm:"size:4096"`
+	Options           string                `json:"-",gorm:"size:4096"`
 	OptionsSerialized serializer.UserOption `gorm:"-"`
 }
 
diff --git a/service/user/login.go b/service/user/login.go
index 03e3e7d..7c6b791 100644
--- a/service/user/login.go
+++ b/service/user/login.go
@@ -42,13 +42,13 @@ func (service *UserLoginService) Login(c *gin.Context) serializer.Response {
 	}
 
 	//登陆成功，清空并设置session
-	ClearSession(c)
 	SetSession(c, map[string]interface{}{
 		"user_id": expectedUser.ID,
 	})
 
 	return serializer.Response{
 		Code: 0,
+		Data: &expectedUser,
 		Msg:  "",
 	}