fix lib

.gitignore

@@ -7,3 +7,5 @@
 *.iml
 out
 gen
+vendor/
+composer.lock

composer.json

@@ -1,6 +1,6 @@
 {
   "require": {
-    "esd/base-server":"~0.1",
+    "esd/esd-core":"~0.1",
     "esd/annotations-scan-plugin": "~0.1",
     "inhere/php-validate": "^2.6"
   },

src/Validate/Annotation/Filter.php

@@ -12,7 +12,6 @@
 use DI\DependencyException;
 use Doctrine\Common\Annotations\Annotation;
 use Doctrine\Common\Annotations\CachedReader;
-use ESD\BaseServer\Server\Server;
 use Inhere\Validate\Filter\Filtration;
 use ReflectionClass;
 
@@ -194,7 +193,7 @@ public static function buildRole($reflectionClass)
         }
         $filterRole = [];
         foreach ($reflectionClass->getProperties() as $property) {
-            $filters = Server::$instance->getContainer()->get(CachedReader::class)->getPropertyAnnotations($property);
+            $filters = DIget(CachedReader::class)->getPropertyAnnotations($property);
             foreach ($filters as $filter) {
                 if ($filter instanceof Filter) {
                     $one = $filter->build($property->name);

src/Validate/Annotation/Validated.php

@@ -11,7 +11,7 @@
 use DI\DependencyException;
 use Doctrine\Common\Annotations\Annotation;
 use Doctrine\Common\Annotations\CachedReader;
-use ESD\BaseServer\Server\Server;
+use ESD\Core\Server\Server;
 use ESD\Plugins\Validate\ValidationException;
 use Inhere\Validate\Validation;
 use ReflectionClass;
@@ -398,7 +398,7 @@ public static function buildRole($reflectionClass, $roles = [])
         }
         $validRole = [];
         foreach ($reflectionClass->getProperties() as $property) {
-            $validateds = Server::$instance->getContainer()->get(CachedReader::class)->getPropertyAnnotations($property);
+            $validateds = DIget(CachedReader::class)->getPropertyAnnotations($property);
             foreach ($validateds as $validated) {
                 if ($validated instanceof Validated) {
                     foreach ($validated->build($property->name) as $one) {

src/Validate/ValidatePlugin.php

@@ -9,9 +9,9 @@
 namespace ESD\Plugins\Validate;
 
 
-use ESD\BaseServer\Server\Context;
-use ESD\BaseServer\Server\PlugIn\AbstractPlugin;
-use ESD\BaseServer\Server\PlugIn\PluginInterfaceManager;
+use ESD\Core\Context\Context;
+use ESD\Core\Plugin\AbstractPlugin;
+use ESD\Core\Plugin\PluginInterfaceManager;
 use ESD\Plugins\AnnotationsScan\AnnotationsScanPlugin;
 use ESD\Plugins\Validate\Annotation\Validated;
 
@@ -32,7 +32,7 @@ public function __construct()
      * @param PluginInterfaceManager $pluginInterfaceManager
      * @return mixed|void
      * @throws \DI\DependencyException
-     * @throws \ESD\BaseServer\Exception
+     * @throws \ESD\Core\Exception
      * @throws \ReflectionException
      */
     public function onAdded(PluginInterfaceManager $pluginInterfaceManager)
@@ -53,7 +53,6 @@ public function getName(): string
     /**
      * 初始化
      * @param Context $context
-     * @return mixed
      */
     public function beforeServerStart(Context $context)
     {
@@ -63,7 +62,6 @@ public function beforeServerStart(Context $context)
     /**
      * 在进程启动前
      * @param Context $context
-     * @return mixed
      */
     public function beforeProcessStart(Context $context)
     {

src/Validate/ValidationException.php

@@ -9,7 +9,7 @@
 namespace ESD\Plugins\Validate;
 
 
-use ESD\BaseServer\Exception;
+use ESD\Core\Exception;
 use Throwable;
 
 class ValidationException extends Exception