个人简介功能

mytheshow · Nov 1, 2017 · bdd20ff · bdd20ff
1 parent b108aad
commit bdd20ff
Show file tree

Hide file tree

Showing 11 changed files with 89 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,2 @@
-## 修改bsae.html
-
-> navbar当登陆后显示个人中心，未登陆显示login
-
-## 其他
-
-> 创建roles表，在users表增加一些字段
+1. 原来登陆后session存取的user_msg改为只存取uid
+2. 完成登陆后带有个人简介的功能
diff --git a/application/config.php b/application/config.php
@@ -245,6 +245,7 @@
     ],
 
     //密钥
-    'SECRET_KEY' => '123456'
-
+    'SECRET_KEY' => '123456',
+    //超级管理员
+    'BLOG_ADMIN' => '[email protected]'
 ];
diff --git a/application/index/controller/Auth.php b/application/index/controller/Auth.php
@@ -44,13 +44,19 @@ public function register(Request $request){
                     $this->assign('flashed_messages',$flashed_messages);
                     return view('register');
                 }
-
+                $roles = db('roles');
+                if($data['email']==config('BLOG_ADMIN')){
+                    $role = $roles->where('name','Administrator')->find();
+                }else{
+                    $role = $roles->where('name','User')->find();
+                }
                 $user = model('Users');
                 $user->data([
                     'username'=>$data['username'],
                     'email'=>$data['email'],
                     'password'=>md5($data['password']),
-                    'create_time'=>date('Y-m-d H:i:s')
+                    'create_time'=>date('Y-m-d H:i:s'),
+                    'role_id'=>$role['id']
                 ]);
                 $res = $user->save();
                 if($res){
@@ -75,6 +81,7 @@ public function register(Request $request){
                     $this->assign('flashed_messages',$flashed_messages);
                 }
         }
+
         return view();
     }
     public function ajax_email(Request $request){
@@ -135,4 +142,5 @@ public function confirm(Request $request){
         }
         abort(404);
     }
+
 }
diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php
@@ -6,9 +6,22 @@ class Index extends Common
 //    protected $beforeActionList = [
 //        'beforeAuth'
 //    ];
+
     public function index()
     {
-        $this->assign('user_msg',session('user_msg'));
+        $user_msg = db('users')->where('id',session('uid'))->find();
+        $this->assign('user_msg',$user_msg);
         return view('index');
     }
+
+    public function user($username){
+        if(session('uid')){
+            $user_msg = db('users')->where('id',session('uid'))->find();
+            $user_msg['last_login_ip'] = long2ip(cookie('last_login_ip'));
+            $user_msg['last_seen'] = long2ip(cookie('last_seen'));
+            $this->assign('user_msg',$user_msg);
+            return view();
+        }
+        abort(404);
+    }
 }
diff --git a/application/index/model/Roles.php b/application/index/model/Roles.php
@@ -0,0 +1,7 @@
+<?php
+namespace app\index\Model;
+use think\Model;
+
+class Roles extends Model{
+
+}
diff --git a/application/index/model/Users.php b/application/index/model/Users.php
@@ -12,6 +12,9 @@ public function login($email, $password, $auto){
                 session('unconfirmed',$user['id']);
                 return -2 ;
             }
+            //在更新之前，把上次登陆时间和ip存入cookie
+            cookie('last_seen', $user['last_seen']);
+            cookie('last_login_ip', $user['last_login_ip']);
             $request = request();
             $update = array(
                 'id'=>$user['id'],
@@ -20,13 +23,13 @@ public function login($email, $password, $auto){
             );
             $this->update($update);
             //存入session
-            $auth=array(
-                'id' => $user['id'],
-                'username' => $user['username'],
-                'last_seen' => $user['last_seen'],
-                'last_login_ip' => $user['last_login_ip']
-            );
-            session('user_msg',$auth);
+//            $auth=array(
+//                'id' => $user['id'],
+//                'username' => $user['username'],
+//                'last_seen' => $user['last_seen'],
+//                'last_login_ip' => $user['last_login_ip']
+//            );
+            session('uid',$user['id']);
             //将用户名加密写入cookie
             if($auto=="y"){
                 cookie('auto',encryption($user['username'].'|'.$request->ip()),3600*24*30);

diff --git a/application/index/view/common/base.html b/application/index/view/common/base.html
@@ -12,6 +12,7 @@
     <script src="/static/index/js/validator.js" ></script>
 </head>
 <body>
+
 {block name="navbar"}
 <div class="navbar navbar-inverse" role="navigation">
     <div class="container">
@@ -26,11 +27,13 @@
         </div>
         <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
-                <li><a href="">Home</a></li>
-                <li><a href="">Home2</a></li>
+                <li><a href="/">主页</a></li>
+                {if condition=" isset($user_msg) "}
+                    <li><a href="/user/{$user_msg.username}">个人简介</a></li>
+                {/if}
             </ul>
             <ul class="nav navbar-nav navbar-right ">
-                {if condition=" isset($user_msg) "}
+                {if condition="isset($user_msg)"}
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                             个人中心<b class="caret"></b>

diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html
@@ -1,3 +1,3 @@
 {extend name="common/base" /}
 {block name="title"}我是首页{/block}
-{block name="page_content"}<h3>{$Think.APP_PATH}</h3>{/block}
+{block name="page_content"}<h3>{$user_msg.username}</h3>{/block}
diff --git a/application/index/view/index/user.html b/application/index/view/index/user.html
@@ -0,0 +1,19 @@
+{extend name="common/base" /}
+{block name="title"}个人简介{/block}
+{block name="page_content"}
+<div class="page-header">
+    <h1>{$user_msg.username}</h1>
+    <p>
+        {$user_msg.name}
+        来自：  <a href="http://maps.google.com/?q={$user_msg.location}">
+                  {$user_msg.location}
+                </a>
+    </p>
+    <p><a href="mailto:{$user_msg.email}">{$user_msg.email}</a></p>
+    <p>{$user_msg.about_me}</p>
+    <p>
+        上次登陆IP： {$user_msg.last_login_ip}<br/>
+        上次登陆时间： {$user_msg.last_seen}
+    </p>
+</div>
+{/block}
diff --git a/application/route.php b/application/route.php
@@ -8,4 +8,5 @@
 Route::post('/ajax_email', 'index/auth/ajax_email',['ajax' => true]);
 Route::post('/ajax_username', 'index/auth/ajax_username',['ajax' => true]);
 Route::get('/active_user/:activecode', 'index/auth/active_user');
-Route::get('/confirm', 'index/auth/confirm');
+Route::get('/confirm', 'index/auth/confirm');
+Route::get('/user/:username', 'index/index/user');
diff --git a/database/seeds/RolesSeeder.php b/database/seeds/RolesSeeder.php
@@ -0,0 +1,15 @@
+<?php
+
+use think\migration\Seeder;
+
+class RolesSeeder extends Seeder
+{
+    public function run()
+    {
+        $rows = [
+            ['name' => 'Administrator','permission'=>255],
+            ['name' => 'User','permission'=>7]
+            ];
+        $this->table('roles')->insert($rows)->save();
+    }
+}