molong/sentos
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新目录结构

Browse Source
This commit is contained in:
molong
2023-10-21 17:45:00 +08:00
parent 59cc869bb2
commit 664295167d
55 changed files with 1856 additions and 6329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/auth/AuthService.php
View File

@@ -10,7 +10,7 @@ namespace app\services\auth;
use app\model\auth\Users;
use app\model\auth\Permissions;
use sent\tree\Tree;
use Xin\Support\Arr;
use think\facade\Env;
class AuthService{
@@ -52,7 +52,7 @@ class AuthService{
public function getAuthMenu(){
$order = "sort asc, id desc";
$map = [];
if(request()->user['uid'] != Env::get('admin_root')){
if(request()->user['uid'] != Env::get('ADMIN')){
$map[] = ['name', 'IN', request()->auth()['permission']];
}
$map[] = ['type', '<>', 'button'];
@@ -62,7 +62,7 @@ class AuthService{
$item->hiddenBreadcrumb = (int) $item['hiddenBreadcrumb'];
})->toArray();
return (new Tree())->listToTree($list, 'id', 'parent_id', 'children');
return Arr::tree($list, null, 0, ['id'=>'id', 'parent' => 'parent_id', 'child' => 'children']);
}
/**
@@ -72,7 +72,7 @@ class AuthService{
*/
public function getAuthPermissions(){
$map = [];
if(request()->user['uid'] != Env::get('admin_root')){
if(request()->user['uid'] != Env::get('ADMIN')){
$map[] = ['name', 'IN', request()->auth()['permission']];
}
$list = Permissions::where($map)->select();

8
app/services/auth/MenuService.php
View File

@@ -9,8 +9,7 @@
namespace app\services\auth;
use app\model\auth\Permissions;
use sent\tree\Tree;
use think\facade\Env;
use Xin\Support\Arr;
class MenuService{
@@ -21,10 +20,9 @@ class MenuService{
* @return void
*/
public function getSystemMenu($is_menu = true, $is_tree = true){
$rootid = Env::get('admin_root');
$order = "sort asc, id desc";
$map = [];
if(request()->user['uid'] != $rootid){
if(request()->user['uid'] != env('ADMIN')){
$map[] = ['name', 'IN', request()->auth()['permission']];
}
if($is_menu){
@@ -37,7 +35,7 @@ class MenuService{
$item->hiddenBreadcrumb = (int) $item['hiddenBreadcrumb'];
})->toArray();
if($is_tree){
$menu = (new Tree())->listToTree($list, 'id', 'parent_id', 'children');
$menu = Arr::tree($list, null, 0, ['id'=>'id', 'parent' => 'parent_id', 'child' => 'children']);
return $menu;
}else{

4
app/services/auth/RoleService.php
View File

@@ -11,7 +11,7 @@ namespace app\services\auth;
use app\model\auth\Roles;
use app\model\auth\PermissionAccess;
use app\model\auth\RolesAccess;
use sent\tree\Tree;
use Xin\Support\Arr;
class RoleService{
/**
@@ -36,7 +36,7 @@ class RoleService{
$item->permission_id = $permission_id;
});
if($is_tree){
return (new Tree())->listToTree($list->toArray(), 'id', 'parent_id', 'children');
return Arr::tree($list->toArray(), null, 0, ['id'=>'id', 'parent' => 'parent_id', 'child' => 'children']);
}else{
return $list;
}

8
app/services/auth/UsersLogService.php
View File

@@ -10,8 +10,8 @@ namespace app\services\auth;
use app\model\auth\Users;
use app\model\auth\UsersLog;
use xin\helper\Server;
use xin\helper\Time;
use Xin\Support\Server;
use Xin\Support\Time;
class UsersLogService{
@@ -133,7 +133,7 @@ class UsersLogService{
}
protected static function Parser($text) {
$doc = new \doc\Doc();
return $doc->parse($text);
$service = app()->make(\sent\services\DocService::class);
return $service->parse($text);
}
}