merge branch wuxuehai

app/Http/Controllers/Admin/LoginController.php

@@ -0,0 +1,19 @@
+<?php
+/** +----------------------------------------------------------------------
+ * | KeepMoving
+ * +----------------------------------------------------------------------
+ * | Date : 16/6/5 下午4:08
+ * +----------------------------------------------------------------------
+ * | Author: WuXueHai '<367052992@qq.com>'
+ * +----------------------------------------------------------------------*/
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+
+class LoginController extends Controller
+{
+    public function login(){
+        return View('Admin.login');
+    }
+}

app/Http/routes.php

@@ -14,3 +14,9 @@
 Route::get('/', function () {
     return view('welcome');
 });
+
+
+Route::get('/admin/', 'Admin\MainController@index');
+Route::get('/admin/login', 'Admin\LoginController@login');
+
+

app/Models/Admin/Administrator.php

@@ -0,0 +1,12 @@
+<?php
+/** +----------------------------------------------------------------------
+ * | KeepMoving
+ * +----------------------------------------------------------------------
+ * | Date : 16/6/5 下午3:57
+ * +----------------------------------------------------------------------
+ * | Author: WuXueHai '<367052992@qq.com>'
+ * +----------------------------------------------------------------------*/
+
+namespace App\Models\Admin;
+
+class Admin

app/Models/Admin/RBAC/Permission.php

@@ -0,0 +1,8 @@
+<?php
+/** +----------------------------------------------------------------------
+ * | KeepMoving
+ * +----------------------------------------------------------------------
+ * | Date : 16/6/5 下午3:49
+ * +----------------------------------------------------------------------
+ * | Author: WuXueHai '<367052992@qq.com>'
+ * +----------------------------------------------------------------------*/

app/Models/Admin/RBAC/Role.php

@@ -0,0 +1,17 @@
+<?php
+/** +----------------------------------------------------------------------
+ * | KeepMoving
+ * +----------------------------------------------------------------------
+ * | Date : 16/6/5 下午3:45
+ * +----------------------------------------------------------------------
+ * | Author: WuXueHai '<367052992@qq.com>'
+ * +----------------------------------------------------------------------*/
+
+namespace App\Models\Admin;
+
+use Zizaco\Entrust\EntrustRole;
+
+class Role extends EntrustRole
+{
+
+}

database/migrations/2016_06_05_073918_entrust_setup_tables.php

@@ -0,0 +1,71 @@
+<?php
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class EntrustSetupTables extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return  void
+     */
+    public function up()
+    {
+        // Create table for storing roles
+        Schema::create('roles', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name')->unique();
+            $table->string('display_name')->nullable();
+            $table->string('description')->nullable();
+            $table->timestamps();
+        });
+
+        // Create table for associating roles to users (Many-to-Many)
+        Schema::create('role_user', function (Blueprint $table) {
+            $table->integer('user_id')->unsigned();
+            $table->integer('role_id')->unsigned();
+
+            /*$table->foreign('user_id')->references('id')->on('')
+                ->onUpdate('cascade')->onDelete('cascade');
+            $table->foreign('role_id')->references('id')->on('roles')
+                ->onUpdate('cascade')->onDelete('cascade');*/
+
+            $table->primary(['user_id', 'role_id']);
+        });
+
+        // Create table for storing permissions
+        Schema::create('permissions', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name')->unique();
+            $table->string('display_name')->nullable();
+            $table->string('description')->nullable();
+            $table->timestamps();
+        });
+
+        // Create table for associating permissions to roles (Many-to-Many)
+        Schema::create('permission_role', function (Blueprint $table) {
+            $table->integer('permission_id')->unsigned();
+            $table->integer('role_id')->unsigned();
+
+            $table->foreign('permission_id')->references('id')->on('permissions')
+                ->onUpdate('cascade')->onDelete('cascade');
+            $table->foreign('role_id')->references('id')->on('roles')
+                ->onUpdate('cascade')->onDelete('cascade');
+
+            $table->primary(['permission_id', 'role_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return  void
+     */
+    public function down()
+    {
+        Schema::drop('permission_role');
+        Schema::drop('permissions');
+        Schema::drop('role_user');
+        Schema::drop('roles');
+    }
+}

resources/views/Admin/login.blade.php

@@ -0,0 +1,11 @@
+<?php
+/** +----------------------------------------------------------------------
+ * | KeepMoving
+ * +----------------------------------------------------------------------
+ * | Date : 16/6/5 下午4:13
+ * +----------------------------------------------------------------------
+ * | Author: WuXueHai '<367052992@qq.com>'
+ * +----------------------------------------------------------------------*/
+
+
+        echo 111;