后台重新初始化

lanceWan · May 24, 2016 · bae9c24 · bae9c24
1 parent d52bc72
commit bae9c24
Show file tree

Hide file tree

Showing 541 changed files with 76,964 additions and 3,803 deletions.
diff --git a/.env.example b/.env.example
@@ -8,12 +8,14 @@ DB_USERNAME=homestead
 DB_PASSWORD=secret
 
 CACHE_DRIVER=file
+CACHE_PREFIX=laravel
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
+REDIS_DATABASE=0
 
 MAIL_DRIVER=smtp
 MAIL_HOST=mailtrap.io

diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,6 @@ Homestead.yaml
 Homestead.json
 .env
 /public/uploads
-.tags*
+.tags*
+.DS_Store
+/bootstrap
diff --git a/app/Facades/ChatFacade.php b/app/Facades/ChatFacade.php
diff --git a/app/Http/Controllers/Admin/ChatController.php b/app/Http/Controllers/Admin/ChatController.php
diff --git a/app/Http/Controllers/Admin/IndexController.php b/app/Http/Controllers/Admin/IndexController.php
@@ -3,8 +3,6 @@
 use Illuminate\Http\Request;
 use App\Http\Requests;
 use App\Http\Controllers\Controller;
-use App\Models\Friend;
-use Auth;
 class IndexController extends Controller
 {
 
@@ -13,24 +11,6 @@ public function index()
 		return view('admin.index.index');
 	}
 
-	public function findMyFriend()
-	{
-		$friends = Friend::with('user')->where('user_id',Auth::user()->id)->get()->toArray();
-		if ($friends) {
-			$item = [];
-			foreach ($friends as $friend) {
-				$temp = [];
-				$temp['id'] = $friend['user']['id'];
-				$temp['name'] = $friend['user']['name'];
-				$temp['face'] = 'http://tp1.sinaimg.cn/1571889140/180/40030060651/1';
-				$item[] = $temp;
-			}
-			// echo json_encode(['status' => 1 ,'msg' => 'ok','data' => ["name" => "在线好友","nums" => 1,"id" => 1,'item' => $item] ]);exit();
-			return response()->json(['status' => 1 ,'msg' => 'ok','data' => ["name" => "在线好友","nums" => 1,"id" => 1,'item' => $item] ]);
-		}
-
-	}
-
 	/**
 	 * dataTable 多语言
 	 * @author 晚黎

diff --git a/app/Http/Controllers/Admin/MenuController.php b/app/Http/Controllers/Admin/MenuController.php
@@ -7,6 +7,13 @@
 use App\Http\Requests\MenuRequest;
 class MenuController extends Controller
 {
+    public function __construct()
+    {
+        $this->middleware('checkPermission:'.config('admin.permissions.menu.list'), ['only' => ['index', 'sort']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.menu.create'), ['only' => ['store']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.menu.edit'), ['only' => ['edit', 'update']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.menu.destory'), ['only' => ['destroy']]);
+    }
 	/**
 	 * 菜单首页
 	 * @author 晚黎

diff --git a/app/Http/Controllers/Admin/PermissionController.php b/app/Http/Controllers/Admin/PermissionController.php
@@ -7,6 +7,14 @@
 use App\Http\Requests\PermissionRequest;
 class PermissionController extends Controller
 {
+    public function __construct()
+    {
+        $this->middleware('checkPermission:'.config('admin.permissions.permission.list'), ['only' => ['index', 'ajaxIndex']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.permission.create'), ['only' => ['create', 'store']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.permission.edit'), ['only' => ['edit', 'update']]);
+        $this->middleware('checkPermission:'.config('admin.global.permission.action').',true', ['only' => ['mark']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.permission.destory'), ['only' => ['destroy']]);
+    }
     public function index()
     {
     	return view('admin.permission.list');

diff --git a/app/Http/Controllers/Admin/RoleController.php b/app/Http/Controllers/Admin/RoleController.php
@@ -9,6 +9,16 @@
 use PermissionRepository;
 class RoleController extends Controller
 {	
+
+    public function __construct()
+    {
+        $this->middleware('checkPermission:'.config('admin.permissions.role.list'), ['only' => ['index', 'ajaxIndex']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.role.create'), ['only' => ['create', 'store']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.role.edit'), ['only' => ['edit', 'update']]);
+        $this->middleware('checkPermission:'.config('admin.global.role.action').',true', ['only' => ['mark']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.role.destory'), ['only' => ['destroy']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.role.show'), ['only' => ['show']]);
+    }
 	/**
 	 * 角色列表
 	 * @author 晚黎

diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
@@ -12,6 +12,16 @@
 use App\Http\Requests\UpdateUserRequest;
 class UserController extends Controller
 {
+    public function __construct()
+    {
+        $this->middleware('checkPermission:'.config('admin.permissions.user.list'), ['only' => ['index', 'ajaxIndex']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.user.create'), ['only' => ['create', 'store']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.user.edit'), ['only' => ['edit', 'update']]);
+        $this->middleware('checkPermission:'.config('admin.global.user.action').',true', ['only' => ['mark']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.user.destory'), ['only' => ['destroy']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.user.show'), ['only' => ['show']]);
+        $this->middleware('checkPermission:'.config('admin.permissions.user.reset'), ['only' => ['changePassword','resetPassword']]);
+    }
 	/**
      * 用户列表
      * @author 晚黎

diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
@@ -8,6 +8,7 @@
 use Illuminate\Foundation\Auth\ThrottlesLogins;
 use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
 use Illuminate\Http\Request;
+use Captcha;
 
 class AuthController extends Controller
 {
@@ -78,10 +79,13 @@ protected function create(array $data)
      */
     protected function validateLogin(Request $request)
     {
-        return Validator::make($request->all(), [
+        $this->validate($request,[
             'email' => 'required',
             'password' => 'required',
-            'captcha' => 'required|captcha'
-        ]);
+            'captcha' => 'required|captcha'  
+            ],[
+            'captcha.captcha' => trans('validation.captcha'),
+            'captcha.required' => trans('validation.captcha_required'),
+            ]);
     }
 }
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -48,6 +48,6 @@ class Kernel extends HttpKernel
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'rong' => \App\Http\Middleware\UserTokenMiddleware::class,
+        'checkPermission' => \App\Http\Middleware\CheckPermissionMiddleware::class,
     ];
 }
diff --git a/app/Http/Middleware/CheckPermissionMiddleware.php b/app/Http/Middleware/CheckPermissionMiddleware.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class CheckPermissionMiddleware
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next,$permission,$mark = false)
+    {
+        // 更改状态权限
+        if ($mark) {
+            if (! $request->user()->canOne([config('admin.permissions.'.$permission.'.audit'),config('admin.permissions.'.$permission.'.undo'),config('admin.permissions.'.$permission.'.trash')])) {
+                abort(500,trans('errors.permissions'));
+            }
+        }else{
+            if (! $request->user()->can($permission)) {
+                abort(500,trans('errors.permissions'));
+            }
+        }
+
+        return $next($request);
+    }
+}
diff --git a/app/Http/Middleware/UserTokenMiddleware.php b/app/Http/Middleware/UserTokenMiddleware.php
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
@@ -12,6 +12,6 @@ class VerifyCsrfToken extends BaseVerifier
      * @var array
      */
     protected $except = [
-    	'admin/chat/*'
+    	'/admin/article/upload'
     ];
 }
diff --git a/app/Http/Routes/ChatRoute.php b/app/Http/Routes/ChatRoute.php
diff --git a/app/Http/routes.php b/app/Http/routes.php
@@ -27,13 +27,12 @@
 */
 
 Route::group(['middleware' => ['web']], function () {
-    Route::auth();
     Route::get('/home', 'HomeController@index');
+    Route::auth();
 });
 
-Route::group(['prefix' => 'admin', 'namespace' => 'Admin','middleware' => ['web', 'auth','rong']], function ($router) {
+Route::group(['prefix' => 'admin', 'namespace' => 'Admin','middleware' => ['web', 'auth']], function ($router) {
     $router->get('/', 'IndexController@index');
-    $router->get('/friend', 'IndexController@findMyFriend');
     $router->get('/i18n', 'IndexController@dataTableI18n');
 
     /*用户*/
@@ -44,6 +43,4 @@
     require(__DIR__ . '/Routes/MenuRoute.php');
     // 角色
     require(__DIR__ . '/Routes/RoleRoute.php');
-    //聊天
-    require(__DIR__ . '/Routes/ChatRoute.php');
 });
diff --git a/app/Models/ActionAttributeTrait.php b/app/Models/ActionAttributeTrait.php
@@ -92,9 +92,9 @@ public function getAuditActionButton()
 	 * @date   2016-03-10T10:08:20+0800
 	 * @return [type]                   [description]
 	 */
-	public function getDestoryActionButton()
+	public function getDestoryActionButton($showType = true)
 	{
-		if (($this->status == config('admin.global.status.trash'))) {
+		if (($this->status == config('admin.global.status.trash')) || $showType == false) {
 			if (Auth::user()->can(config('admin.permissions.'.$this->action.'.destory'))) {
 				return '<a href="javascript:;" onclick="return false" class="btn btn-xs btn-danger tooltips" data-container="body" data-original-title="' . trans('crud.destory') . '"  data-placement="top" id="destory"><i class="fa fa-trash"></i><form action="'.url('admin/'.$this->action.'/'.$this->id).'" method="POST" name="delete_item" style="display:none"><input type="hidden" name="_method" value="delete"><input type="hidden" name="_token" value="'.csrf_token().'"></form></a>';
 			}
@@ -127,6 +127,6 @@ public function getActionButtonAttribute($showType = true)
 				$this->getUndoActionButton().
 				$this->getAuditActionButton().
 				$this->getTrashActionButton().
-				$this->getDestoryActionButton();
+				$this->getDestoryActionButton($showType);
 	}
 }
diff --git a/app/Models/Friend.php b/app/Models/Friend.php
diff --git a/app/Providers/BackendServiceProvider.php b/app/Providers/BackendServiceProvider.php
@@ -2,6 +2,7 @@
 namespace App\Providers;
 use Illuminate\Support\ServiceProvider;
 use MenuRepository;
+use Auth;
 class BackendServiceProvider extends ServiceProvider
 {
     /**
@@ -38,8 +39,5 @@ public function register()
         $this->app->singleton('MenuRepository', function($app){
             return new \App\Repositories\admin\MenuRepository();
         });
-        $this->app->singleton('ChatRepository', function($app){
-            return new \App\Repositories\admin\ChatRepository();
-        });
     }
 }