权限注解

src/Common/Bean/Annotation/Auth.php

@@ -11,26 +11,18 @@ use Doctrine\Common\Annotations\Annotation\Target;
 
 
 /**
 /**
  * @Annotation
  * @Annotation
- * @Target("ALL")
+ * @Target({"ALL"})
  * Class Auth
  * Class Auth
  * @package App\Bean\Annotation
  * @package App\Bean\Annotation
  */
  */
 class Auth
 class Auth
 {
 {
-    private $name='';
-
     private $scope=0;
     private $scope=0;
 
 
     private $option='==';
     private $option='==';
 
 
     public function __construct(array $values)
     public function __construct(array $values)
     {
     {
-        if (isset($values['value'])) {
-            $this->name = $values['value'];
-        }
-        if (isset($values['name'])) {
-            $this->name = $values['name'];
-        }
 
 
         if (isset($values['scope'])) {
         if (isset($values['scope'])) {
             $this->scope = $values['scope'];
             $this->scope = $values['scope'];
@@ -41,25 +33,15 @@ class Auth
         }
         }
     }
     }
 
 
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
 
 
     public function setScope($scope)
     public function setScope($scope)
     {
     {
-        $this->scope = $scope;
+        return $this->scope = $scope;
     }
     }
 
 
     public function setOption($option)
     public function setOption($option)
     {
     {
-        $this->option = $option;
-    }
-
-
-    public function getName() : string
-    {
-        return $this->name;
+        return $this->option = $option;
     }
     }
 
 
     public function getScope()
     public function getScope()

src/Common/Bean/Collector/AuthCollector.php

@@ -33,9 +33,6 @@ class AuthCollector implements CollectorInterface
                 self::$auth[$className]['methods'][$methodName]['scope'] = $scope;
                 self::$auth[$className]['methods'][$methodName]['scope'] = $scope;
                 self::$auth[$className]['methods'][$methodName]['option'] = $option;
                 self::$auth[$className]['methods'][$methodName]['option'] = $option;
             }
             }
-
-
-
         }
         }
 
 
     }
     }

src/Common/Bean/Parser/AuthParser.php

@@ -24,13 +24,7 @@ class AuthParser extends AbstractParser
                            string $methodName = '',
                            string $methodName = '',
                            $propertyValue = null)
                            $propertyValue = null)
     {
     {
-        $beanName = $className;
-        $scope    = Scope::SINGLETON;
-
         AuthCollector::collect($className, $objectAnnotation, $propertyName, $methodName, $propertyValue);
         AuthCollector::collect($className, $objectAnnotation, $propertyName, $methodName, $propertyValue);
-
-        return [$beanName, $scope, ""];
-
     }
     }
 
 
 }
 }
\ No newline at end of file

src/Common/Entity/Query.php

@@ -52,9 +52,12 @@ class Query
             $query->selectInstance($entityCollector[$className]['instance']);
             $query->selectInstance($entityCollector[$className]['instance']);
 
 
 
 
-        } elseif ( isset($map[$tableName]) ) { //非实体
+        } elseif ( isset($map[$tableName]) ) { //非实体且分表
             $className = $map[$tableName];
             $className = $map[$tableName];
+            $defaultTbleName = $tableName;
             $tableName = $tableName.'_'.self::getDbNum($className);
             $tableName = $tableName.'_'.self::getDbNum($className);
+            //设置分表对应的className
+            EntityCollector::setCollector($tableName, $defaultTbleName);
 
 
         }
         }