更新

app/controller/Index.php

@@ -0,0 +1,39 @@
+<?php
+// +----------------------------------------------------------------------
+// | SentCMS [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
+// +----------------------------------------------------------------------
+namespace app\controller;
+
+use app\controller\Base;
+
+/**
+ * @title 首页
+ */
+class Index extends Base{
+
+	/**
+	 * @title 首页
+	 *
+	 * @return void
+	 */
+	public function index(){
+		if(request()->isAjax()){
+			return ['code' => 1, 'data' => 'SentOS'];
+		}else{
+			return view('/index');
+		}
+	}
+
+	public function test(){
+		// $area = \think\facade\Db::name('areas')->select();
+		// $save = [];
+		// foreach($area as $val){
+		// 	$save[] = ['title' => $val['area'], 'code' => $val['area_id'], 'parent_id' => $val['city_id'], 'first' => '', 'create_time' => time(), 'update_time' => time()];
+		// }
+		// \think\facade\Db::name('area')->insertAll($save);
+	}
+}

app/controller/system/Menu.php

@@ -58,7 +58,7 @@ class Menu extends Base{
 		try {
 			$result = app()->make(MenuService::class)->saveData($data);
 			if($result){
-				$this->data['data'] = app()->make(MenuService::class)->getSystemMenu();
+				$this->data['data'] = app()->make(AuthService::class)->getAuthMenu();
 			}
 		} catch (\Exception $e) {
 			$this->data['code'] = 0;

app/model/auth/Permissions.php

@@ -14,6 +14,8 @@ class Permissions extends \app\model\BaseModel{
 		'updated_time'  => 'timestamp',
 		'hidden'    => 'int',
 		'hiddenBreadcrumb' => 'int',
+		'affix'    => 'int',
+		'fullpage' => 'int',
 		'api_list' => 'json'
 	];
 
@@ -26,6 +28,7 @@ class Permissions extends \app\model\BaseModel{
 			'hidden' => (int) $data['hidden'],
 			'hiddenBreadcrumb' => (int) $data['hiddenBreadcrumb'],
 			'affix' => (int) $data['affix'],
+			'fullpage' => (int) $data['fullpage'],
 		];
 	}
 

app/services/auth/AuthService.php

@@ -66,8 +66,7 @@ class AuthService{
 		if(request()->user['uid'] != Env::get('admin_root')){
 			$map[] = ['name', 'IN', request()->auth()['permission']];
 		}
-		$map[] = ['type', '=', 'menu'];
-		$map[] = ['hidden', '=', 0];
+		$map[] = ['type', '<>', 'button'];
 		$list = Permissions::where($map)->order($order)->append(['meta'])->select()
 			->each(function($item){
 				$item->hidden = (int) $item['hidden'];
@@ -87,7 +86,6 @@ class AuthService{
 		if(request()->user['uid'] != Env::get('admin_root')){
 			$map[] = ['name', 'IN', request()->auth()['permission']];
 		}
-		$map[] = ['hidden', '=', 0];
 		$list = Permissions::where($map)->select();
 		$data = [];
 		foreach($list as $item){

app/services/auth/MenuService.php

@@ -28,7 +28,7 @@ class MenuService{
 			$map[] = ['name', 'IN', request()->auth()['permission']];
 		}
 		if($is_menu){
-			$map[] = ['type', '=', 'menu'];
+			$map[] = ['type', '<>', 'button'];
 			$map[] = ['hidden', '=', 0];
 		}
 		$list = Permissions::where($map)->order($order)->append(['meta'])->select()