From b261a80c24b38d32b28b53f8ca465d298e5403a2 Mon Sep 17 00:00:00 2001
From: zhaoxiang <756958008@qq.com>
Date: Sat, 5 Nov 2016 00:32:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=96=84=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/config.php          |  1 +
 application/admin/controller/User.php | 15 +++++++++------
 application/admin/model/UserData.php  | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 application/admin/model/UserData.php

diff --git a/application/admin/config.php b/application/admin/config.php
index 843ac5c..b778b70 100644
--- a/application/admin/config.php
+++ b/application/admin/config.php
@@ -2,4 +2,5 @@
 //配置文件
 return [
     'auth_key' => 'mbvUenPqbpxT5WTAXXkFVPHF})0AOGfsMIN01XLu52SgS<R]DQDfj6TlThl897Qd',
+    'online_time' => 3600
 ];
\ No newline at end of file
diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php
index a592d63..d5b28e6 100644
--- a/application/admin/controller/User.php
+++ b/application/admin/controller/User.php
@@ -28,20 +28,23 @@ class User extends Base {
                 if( $userInfo['status'] ){
 
                     //保存用户信息和登录凭证
-                    S($userInfo['_id'], session_id(), C('ONLINE_TIME'));
-                    session('uid', $userInfo['_id']);
+                    cache($userInfo['id'], session_id(), config('online_time'));
+                    session('uid', $userInfo['id']);
 
                     //获取跳转链接，做到从哪来到哪去
-                    $url = empty(session('loginFrom')) ? U('Index/index') : session('loginFrom');
-                    session('loginFrom', null);
+                    if( $request->has('from', 'get') ){
+                        $url = $request->get('from');
+                    }else{
+                        $url = url('Index/index');
+                    }
 
                     //更新用户数据
                     $userData = D('UserData')->where(['uid' => $userInfo['_id']])->find();
                     $data = [];
                     if( $userData ){
                         $data['loginTimes'] = $userData['loginTimes'] + 1;
-                        $data['lastLoginIp'] = get_client_ip(1);
-                        $data['lastLoginTime'] = NOW_TIME;
+                        $data['lastLoginIp'] = Request::instance()->ip(1);
+                        $data['lastLoginTime'] = time();
                         D('UserData')->where(['uid' => $userInfo['_id']])->save($data);
                     }else{
                         $data['loginTimes'] = 1;
diff --git a/application/admin/model/UserData.php b/application/admin/model/UserData.php
new file mode 100644
index 0000000..7ce1e0f
--- /dev/null
+++ b/application/admin/model/UserData.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @since   2016-11-05
+ * @author  zhaoxiang <zhaoxiang051405@gmail.com>
+ */
+
+namespace app\admin\model;
+
+
+use think\Model;
+
+class UserData extends Model {
+
+}
\ No newline at end of file