add

server/app/Http/Controllers/Admin/Auth/LoginController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin\Auth;
 use App\Http\Controllers\Admin\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Validator, Auth;
+use App\Services\Admin\AdminUser;
 
 class LoginController extends Controller
 {
@@ -33,8 +34,10 @@ class LoginController extends Controller
      *
      * @return void
      */
+    private $_service;
     public function __construct()
     {
+        $this->_service = new AdminUser();
         $this->middleware('guest', ['except' => 'logout']);
     }
     /**
@@ -80,6 +83,14 @@ class LoginController extends Controller
             $msg = $validator->messages()->first();
             return $this->showWarning($msg);
         }
+        $ok = $this->_service->login($request->name, $request->password);
+        if($ok) {
+            return redirect("/admin");
+        }else{
+            $msg = $this->_service->getMsg();
+            $this->showWarning($msg);
+        }
+
         if (!Auth::guard('admin')->attempt(['name' => $request->name, 'password' => $request->password])){
             return $this->showMessage('用户名或密码错误!');
         }

server/app/Services/Admin/AdminUser.php

@@ -202,7 +202,7 @@ class AdminUser extends BaseProcess
         }elseif(strpos($login,"@")) {
             $loginField = "email";
         }else{
-            $loginField = "username";
+            $loginField = "name";
         }
         if (\Auth::guard('admin')->attempt(array($loginField => $login, 'password' =>$password)))
         {

server/database/migrations/2017_05_30_203521_create_admin_roles_table.php

@@ -23,7 +23,7 @@ class CreateAdminRolesTable extends Migration
             $table->string('mark', 255)->comment('备注');
             $table->integer('status')->default(1)->comment('是否禁用');
             $table->smallInteger('level')->comment('用户组等级，低等级的不能对高等级的用户做修改');
-            $table->char('department_id', 32)->comment('部门ID');
+            $table->char('department_id', 32)->comment('部门ID')->default(0);
             $table->timestamps();
             $table->softDeletes();