Merge branch 'gq' of http://git.9026.com/roobe/miao

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,13 @@ 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/Http/Controllers/Admin/Base/UserController.php

@@ -92,6 +92,7 @@ class UserController extends Controller
     {
         if(Request::method() == 'POST'){
             $data = Request::input('info');
+            $data['password'] = bcrypt($data['password']);
             if(isset($data['admin_role_id']))$data['admin_role_id'] = implode(',', $data['admin_role_id']);
             if($this->_service->create($data)){
                 $this->showMessage('操作成功', urldecode(Request::input('_referer')));

server/app/Http/Middleware/AuthenticateAdmin.php

@@ -16,6 +16,12 @@ class AuthenticateAdmin
      */
     public function handle($request, Closure $next)
     {
+        $path = $request->path();
+        if ($path == 'admin') {
+            $path = str_replace('admin' ,'/', $path);
+        }else{
+            $path = str_replace('admin/' ,'', $path);
+        }
         if(Auth::guard('admin')->guest()){
             exit("你没有登录<a target='_parent' href='/admin/logout?returnUrl=" . urlencode('http://'.$_SERVER['HTTP_HOST']) . "'>请登录</a>");
         }

server/app/Models/AdminUserModel.php

@@ -32,7 +32,7 @@ class AdminUserModel extends Authenticatable
     protected $fillable = [
         'name',
         'real_name',
-        'username',
+//        'username',
         'password',
         'email',
         'mobile',

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/config/database.php

@@ -50,7 +50,7 @@ return [
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
             'prefix' => '',
-            'strict' => true,
+            'strict' => false,
             'engine' => null,
         ],
 

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();
 

server/database/migrations/2017_05_30_203522_create_admin_users_table.php

@@ -25,8 +25,8 @@ class CreateAdminUsersTable extends Migration
             $table->rememberToken();
             $table->string('email', 100)->comment('EMAIL');
             $table->char('mobile', 11)->comment('手机号');
-            $table->string('avatar', 255)->comment('用户头像');
-            $table->tinyInteger('type')->comment('类型,0:用户,1:员工');
+            $table->string('avatar', 255)->comment('用户头像')->default('');
+            $table->tinyInteger('type')->comment('类型,0:用户,1:员工')->default(1);
             $table->dateTime('last_login_time')->nullable()->comment('最后一次登录时间');
             $table->tinyInteger('status')->default(1)->comment('状态，1启用0禁用');
             $table->tinyInteger('is_root')->nullable()->comment('是否是超级管理员');

server/resources/views/admin/base/user/edit.blade.php

@@ -35,12 +35,12 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-sm-3">账号</label>
-                                    <div class="col-sm-9"><input id="txt_username" name="info[username]" class="form-control" value="{{ $data['username'] or ''}}" placeholder="账号名"></div>
+                                    <label class="control-label col-sm-3">登录名</label>
+                                    <div class="col-sm-9"><input id="txt_username" name="info[name]" class="form-control" value="{{ $data['name'] or ''}}" placeholder="账号名"></div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-sm-3">昵称</label>
-                                    <div class="col-sm-9"><input id="txt_name" name="info[name]" class="form-control" value="{{ $data['name'] or ''}}" placeholder="昵称"></div>
+                                    <label class="control-label col-sm-3">实名</label>
+                                    <div class="col-sm-9"><input id="txt_name" name="info[real_name]" class="form-control" value="{{ $data['real_name'] or ''}}" placeholder="实名"></div>
                                 </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">E-mail</label>