日常更新

app/http/middleware/Admin.php

@@ -32,7 +32,11 @@ class Admin {
 			}
 			return json($this->data);
 		} else {
-			return $response->data($this->fetch());
+			if(\is_string($this->data) && $this->data != ''){
+				return $response;
+			}else{
+				return $response->data($this->fetch());
+			}
 		}
 	}
 

app/http/middleware/AdminAuth.php

@@ -8,7 +8,6 @@
 // +----------------------------------------------------------------------
 namespace app\http\middleware;
 
-use think\facade\Cache;
 use think\facade\Session;
 use think\facade\View;
 
@@ -17,8 +16,6 @@ use think\facade\View;
  */
 class AdminAuth {
 
-	protected $data = ['menu' => [], 'meta_title' => ''];
-
 	public function handle($request, \Closure $next) {
 		$user = Session::get('user');
 
@@ -28,39 +25,12 @@ class AdminAuth {
 				$request->isAdmin = true;
 			}
 
-			$this->getMenu($request); //设置菜单
+			$current_url        = '/' . str_replace('.', '/', strtolower($request->controller())) . '/' . strtolower($request->action());
+			$meta_title = $current_url;
+			View::assign('meta_title', $meta_title);
 			return $next($request);
 		} else {
 			return redirect(url('admin.index/login'))->remember();
 		}
 	}
-
-	/**
-	 * @title 显示菜单
-	 */
-	protected function getMenu($request) {
-		$list = [];
-		$current_controller = '/' . str_replace('.', '/', strtolower($request->controller()));
-		$current_url        = $current_controller . '/' . strtolower($request->action());
-		$menu               = Cache::get('menu');
-		if (!$menu) {
-			$res  = (new \app\model\Menu())->where('is_menu', 1)->select();
-			foreach ($res as $key => $item) {
-				$menu[$item['id']] = $item->toArray();
-			}
-			Cache::set('menu', $menu);
-		}
-		foreach ($menu as $key => $value) {
-			if($current_url == $value['url']){
-				$this->data['meta_title'] = $value['title'];
-			}
-			if ($request->isAdmin || in_array($value['id'], array())) {
-				$list[$value['id']] = $value;
-			}
-		}
-
-		$menuList = list_to_tree($list);
-		$this->data['menu'] = $menuList;
-		View::assign($this->data);
-	}
 }