From a36a90c13d18f9d9b1777a161373b9314925f049 Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Tue, 17 Dec 2019 15:46:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=B9=E6=B3=95=E5=8C=B9=E9=85=8D=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/logic/PermissionManager.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/logic/PermissionManager.php b/backend/logic/PermissionManager.php
index c6632ad..0a0c230 100644
--- a/backend/logic/PermissionManager.php
+++ b/backend/logic/PermissionManager.php
@@ -10,8 +10,8 @@ class PermissionManager
 {
     /**
      * 获取app的已做标记控制器的权限
-     * DESCRIBE 控制器描述，只有控制器的注释添加了该描述，才会自动匹配该控制器；使用例子：DESCRIBE {controllerDescribe} DESCRIBE
-     * ACTION 方法描述，只有控制器下action方法的注释添加了该描述，才会自动匹配该action方法；使用例子：ACTION {actionDescribe} ACTION
+     * DESCRIBE 控制器描述，只有控制器的注释添加了该描述，才会自动匹配该控制器；使用例子：@DESCRIBE {controllerDescribe} DESCRIBE
+     * ACTION 方法描述，只有控制器下action方法的注释添加了该描述，才会自动匹配该action方法；使用例子：@ACTION {actionDescribe} ACTION
      * 匹配控制器中actions的方法，需要添加id参数并且在标明含义，例子：
      * '{actionName}' => [
      *      'class' => 'xxx\xxx\xxx',
@@ -107,7 +107,7 @@ class PermissionManager
         $prefix = '/'.$controllerObject->id.'/';
         $reflection = new ReflectionClass($className);  //通过ReflectionClass方法获取该类的所有信息，包括参数方法等
         $controllerComment = $reflection->getDocComment();
-        $controllerPregRes = preg_match("/(?<=DESCRIBE ).*?(?= DESCRIBE)/", $controllerComment, $controllerDescribe);
+        $controllerPregRes = preg_match("/(?<=@DESCRIBE ).*?(?= DESCRIBE)/", $controllerComment, $controllerDescribe);
         if ($controllerPregRes) {
             $permission = self::getActionsInController($controllerObject, $controllerDescribe, $prefix, $permission);
             $permission = self::getActionInController($className, $prefix, $controllerDescribe, $permission);
@@ -151,7 +151,7 @@ class PermissionManager
         foreach ($reflection->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
             //action的注释
             $actionComment = $method->getDocComment();
-            $actionPregRes = preg_match("/(?<=ACTION ).*?(?= ACTION)/", $actionComment, $actionDescribe);
+            $actionPregRes = preg_match("/(?<=@ACTION ).*?(?= ACTION)/", $actionComment, $actionDescribe);
             if ($actionPregRes) {
                 $actionName = $method->getName();
                 if ($actionName != 'actions' && strpos($actionName, 'action') === 0) {