fix:修改

Author: ExodusHT

config/routing/admin/admin.yaml

@@ -18,6 +18,11 @@ admin_manage_edit_password:
   path:   /edit-password
   controller: App\Controller\Admin\AuthController:editPassword
 
+# 清除缓存
+admin_manage_clearCache:
+  path: /clearCache
+  controller: App\Controller\Admin\AdminController:clearCache
+
 # 管理端-统计台
 admin_manage_statistical_station:
   prefix: /statistical-station

src/Business/AdminBusiness/AdminAuth.php

@@ -10,8 +10,11 @@
 
 namespace App\Business\AdminBusiness;
 
+use App\Business\AuthBusiness\CurAuthSubject;
 use App\Business\AuthBusiness\SubjectAuthInterface;
 use App\Business\AuthBusiness\UserAuthBusiness;
+use App\Business\PlatformBusiness\PlatformClass;
+use App\Business\RBACBusiness\RBACBusiness;
 use App\Entity\Admin;
 use App\Entity\UserAuth;
 use App\Repository\AdminRepository;
@@ -182,7 +185,27 @@ public function delete(Admin $admin)
      */
     public function inletSet(UserAuth $userAuth)
     {
+        $rbac = new RBACBusiness($this->container, PlatformClass::getPlatform());
+        $user = $this->adminRepository->find($userAuth->getSubjectId());
+        $rbac->setIsSuper($user->getIsSuper());
+
+        if(!$rbac->can('statistical_station', 'and', $userAuth)) {
+            if($rbac->can('classify', 'and', $userAuth)){
+                $curAuthSuccessGoUrl = $this->generateUrl('admin_manage_sort_index');
+            }elseif ($rbac->can('user', 'and', $userAuth)){
+                $curAuthSuccessGoUrl = $this->generateUrl('admin_users_index');
+            }elseif ($rbac->can('blog_manage', 'and', $userAuth)){
+                $curAuthSuccessGoUrl = $this->generateUrl('admin_blog_manage_article_index');
+            }elseif ($rbac->can('system-setting', 'and', $userAuth)){
+                $curAuthSuccessGoUrl = $this->generateUrl('admin_manage_admin_role_index');
+            }
+        }else{
+            $curAuthSuccessGoUrl = $this->generateUrl('admin_manage_statistical_station_index');
+        }
 
+        if(!empty($curAuthSuccessGoUrl)){
+            CurAuthSubject::setCurAuthSuccessGoUrl($curAuthSuccessGoUrl);
+        }
     }
 
 }

src/Business/ArticleBusiness/ArticleBusiness.php

@@ -73,11 +73,11 @@ public function validator($class): bool
      *
      * @param Article $article
      * @param null $labels
-     * @param null $sort
+     * @param false $is_built
      * @return bool
      * @throws \Doctrine\DBAL\ConnectionException
      */
-    public function create(Article $article, $labels = null, $sort = null)
+    public function create(Article $article, $labels = null, $is_built = false)
     {
         if(!$this->validator($article)){
             return false;
@@ -113,6 +113,11 @@ public function create(Article $article, $labels = null, $sort = null)
                 }
             }
 
+            if($is_built){
+                $user = $this->getDoctrine()->getRepository('App:Admin')->findAssoc(['name' => '超级管理员']);
+                $article->setUserAuth($user->getUserAuth());
+            }
+
             $this->em->flush();
 
             $this->conn->commit();

src/Controller/Admin/AdminController.php

@@ -13,6 +13,8 @@
 use App\Business\AuthBusiness\CurAuthSubject;
 use App\Business\AuthBusiness\UserAuthBusiness;
 use App\Business\PlatformBusiness\PlatformClass;
+use App\Business\RBACBusiness\PermissionBusiness;
+use App\Business\RBACBusiness\RBACBusiness;
 use App\Entity\UserAuth;
 use App\Repository\AdminRepository;
 use PHPZlc\Admin\Strategy\AdminStrategy;
@@ -21,6 +23,7 @@
 use PHPZlc\PHPZlc\Bundle\Controller\SystemBaseController;
 use PHPZlc\PHPZlc\Doctrine\ORM\Rule\Rule;
 use PHPZlc\PHPZlc\Responses\Responses;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -54,11 +57,17 @@ class AdminController extends SystemBaseController
      */
     protected $page_tag;
 
+    /**
+     * @var RBACBusiness
+     */
+    protected $rbac;
+
     public function inlet($returnType = SystemBaseController::RETURN_HIDE_RESOURCE, $isLogin = true)
     {
         PlatformClass::setPlatform($this->getParameter('platform_admin'));
 
         $this->adminRepository = $this->getDoctrine()->getRepository('App:Admin');
+        $this->rbac = new RBACBusiness($this->container, PlatformClass::getPlatform());
 
         //菜单
         $menus = [
@@ -89,6 +98,7 @@ public function inlet($returnType = SystemBaseController::RETURN_HIDE_RESOURCE,
             ->setSettingPwdUrl($this->generateUrl('admin_manage_edit_password'))
             ->setMenuModel(AdminStrategy::menu_model_simple)
             ->setPageTag($this->page_tag)
+            ->setClearCacheApiUrl($this->generateUrl('admin_manage_clearCache'))
             ->setLogo($this->adminStrategy->getBaseUrl() . '/asset/logo.png')
             ->setMenus($menus);
 
@@ -115,11 +125,19 @@ public function inlet($returnType = SystemBaseController::RETURN_HIDE_RESOURCE,
             $this->adminStrategy->setAdminName(CurAuthSubject::getCurUser()->getAccount());
             $this->adminStrategy->setAdminRoleName(CurAuthSubject::getCurUser()->getName());
 
+            $this->rbac->setIsSuper(CurAuthSubject::getCurUser()->getIsSuper());
 
             //对路由进行权限校验
-
+            if(!$this->rbac->canRoute($this->get('request_stack')->getCurrentRequest()->get('_route'))){
+                if(self::getReturnType() == SystemBaseController::RETURN_HIDE_RESOURCE){
+                    return Responses::error('权限不足');
+                }else{
+                    return $this->render('@PHPZlcAdmin/page/no_permission.html.twig');
+                }
+            }
 
             //对菜单进行权限筛选
+            $this->adminStrategy->setMenus($this->rbac->menusFilter($this->adminStrategy->getMenus()));
         }
 
         return true;
@@ -145,6 +163,29 @@ public function index()
         return $this->render('admin/auth/login.html.twig');
     }
 
+    /**
+     * 清除缓存
+     *
+     * @return bool|JsonResponse|RedirectResponse|Response
+     */
+    public function clearCache()
+    {
+        $r = $this->inlet();
+        if($r !== true){
+            return $r;
+        }
+
+        (new PermissionBusiness($this->container))->builtUpdatePermission();
+
+        $this->get('session')->remove(($this->rbac->getCacheSessionName()));
+
+        if(Errors::isExistError()){
+            return Responses::error(Errors::getError());
+        }
+
+        return Responses::success('缓存清除成功');
+    }
+
     /**
      * 时间段筛选
      *

src/DataFixtures/BlogFixtures.php

@@ -58,6 +58,6 @@ public function load(ObjectManager $manager)
 
         $labels[] = $label->getId();
 
-        (new ArticleBusiness($this->container))->create($article, $labels);
+        (new ArticleBusiness($this->container))->create($article, $labels, true );
     }
 }