update to 1.2.1

add phar build script
2026-07-21 07:35:34 +08:00 · 2020-05-02 23:27:26 +08:00
parent 97e579b8a1
commit 82a1f86bbd
19 changed files with 292 additions and 119 deletions
--- a/src/ZM/Annotation/AnnotationParser.php
+++ b/src/ZM/Annotation/AnnotationParser.php
@@ -18,7 +18,7 @@ use ZM\Annotation\Swoole\{OnStart, OnTick, SwooleEventAfter, SwooleEventAt};
 use ZM\Annotation\Interfaces\Rule;
 use ZM\Connection\WSConnection;
 use ZM\Http\MiddlewareInterface;
-use ZM\Utils\DataProvider;
+use Framework\DataProvider;
 use ZM\Utils\ZMUtil;

 class AnnotationParser
@@ -30,7 +30,7 @@ class AnnotationParser
     */
    public static function registerMods() {
        self::loadAnnotationClasses();
-        $all_class = getAllClasses(WORKING_DIR . "/src/Module/", "Module");
+        $all_class = getAllClasses(DataProvider::getWorkingDir() . "/src/Module/", "Module");
        ZMBuf::$req_mapping[0] = [
            'id' => 0,
            'pid' => -1,
@@ -38,6 +38,7 @@ class AnnotationParser
        ];
        $reader = new AnnotationReader();
        foreach ($all_class as $v) {
+            Console::debug("正在检索 ".$v);
            $reflection_class = new ReflectionClass($v);
            $class_prefix = '';
            $methods = $reflection_class->getMethods(ReflectionMethod::IS_PUBLIC);
@@ -47,15 +48,15 @@ class AnnotationParser
                if ($vs instanceof Closed) {
                    continue 2;
                } elseif ($vs instanceof Controller) {
-                    Console::debug("找到 Controller 中间件: ".$vs->class);
+                    Console::debug("找到 Controller 中间件: " . $vs->class);
                    $class_prefix = $vs->prefix;
                } elseif ($vs instanceof SaveBuffer) {
-                    Console::debug("注册自动保存的缓存变量: ".$vs->buf_name." (Dir:".$vs->sub_folder.")");
+                    Console::debug("注册自动保存的缓存变量: " . $vs->buf_name . " (Dir:" . $vs->sub_folder . ")");
                    DataProvider::addSaveBuffer($vs->buf_name, $vs->sub_folder);
                } elseif ($vs instanceof InitBuffer) {
                    ZMBuf::set($vs->buf_name, []);
                } elseif ($vs instanceof MiddlewareClass) {
-                    Console::verbose("正在注册中间件 " . $vs->class);
+                    Console::verbose("正在注册中间件 " . $reflection_class->getName());
                    $result = [
                        "class" => "\\" . $reflection_class->getName()
                    ];
@@ -299,9 +300,9 @@ class AnnotationParser
            $s = WORKING_DIR . '/src/' . str_replace("\\", "/", $v) . ".php";
            require_once $s;
        }
-        $class = getAllClasses(WORKING_DIR . "/src/Custom/Annotation/", "Custom\\Annotation");
+        $class = getAllClasses(DataProvider::getWorkingDir() . "/src/Custom/Annotation/", "Custom\\Annotation");
        foreach ($class as $v) {
-            $s = WORKING_DIR . '/src/' . str_replace("\\", "/", $v) . ".php";
+            $s = DataProvider::getWorkingDir() . '/src/' . str_replace("\\", "/", $v) . ".php";
            require_once $s;
        }
    }
--- a/src/ZM/Connection/CQConnection.php
+++ b/src/ZM/Connection/CQConnection.php
@@ -20,4 +20,4 @@ class CQConnection extends WSConnection
    public function getType() {
        return "qq";
    }
-}
+}
--- a/src/ZM/Connection/ConnectionManager.php
+++ b/src/ZM/Connection/ConnectionManager.php
@@ -5,6 +5,7 @@ namespace ZM\Connection;


 use Framework\ZMBuf;
+use Framework\DataProvider;

 class ConnectionManager
 {
@@ -67,7 +68,7 @@ class ConnectionManager
    }

    public static function registerCustomClass() {
-        $classes = getAllClasses(WORKING_DIR . "/src/Custom/Connection/", "Custom\\Connection");
+        $classes = getAllClasses(DataProvider::getWorkingDir(). "/src/Custom/Connection/", "Custom\\Connection");
        ZMBuf::$custom_connection_class = $classes;
    }
 }
--- a/src/ZM/DB/DB.php
+++ b/src/ZM/DB/DB.php
@@ -91,6 +91,7 @@ class DB
        if (ZMBuf::get("sql_log") === true) {
            $starttime = microtime(true);
        }
+        Console::debug("MySQL: ".$line);
        try {
            $conn = ZMBuf::$sql_pool->get();
            if ($conn === false) {
--- a/src/ZM/Event/EventHandler.php
+++ b/src/ZM/Event/EventHandler.php
@@ -11,7 +11,7 @@ use Framework\Console;
 use Framework\ZMBuf;
 use ZM\Event\Swoole\{MessageEvent, RequestEvent, WorkerStartEvent, WSCloseEvent, WSOpenEvent};
 use ZM\Http\Response;
-use ZM\Utils\DataProvider;
+use Framework\DataProvider;
 use ZM\Utils\ZMUtil;

 class EventHandler
--- a/src/ZM/Event/Swoole/RequestEvent.php
+++ b/src/ZM/Event/Swoole/RequestEvent.php
@@ -17,6 +17,7 @@ use ZM\Http\MiddlewareInterface;
 use ZM\Http\Response;
 use ZM\ModBase;
 use ZM\ModHandleType;
+use Framework\DataProvider;
 use ZM\Utils\ZMUtil;

 class RequestEvent implements SwooleEvent
@@ -90,7 +91,7 @@ class RequestEvent implements SwooleEvent
                $path = realpath($base_dir . urldecode($uri));
                if ($path !== false) {
                    if (is_dir($path)) $path = $path . '/';
-                    $work = realpath(WORKING_DIR) . '/';
+                    $work = realpath(DataProvider::getWorkingDir()) . '/';
                    if (strpos($path, $work) !== 0) {
                        $this->responseStatus(403);
                        return $this;
--- a/src/ZM/Event/Swoole/WorkerStartEvent.php
+++ b/src/ZM/Event/Swoole/WorkerStartEvent.php
@@ -25,7 +25,7 @@ use Swoole\Server;
 use ZM\Exception\DbException;
 use ZM\ModBase;
 use ZM\ModHandleType;
-use ZM\Utils\DataProvider;
+use Framework\DataProvider;
 use ZM\Utils\SQLPool;
 use ZM\Utils\ZMUtil;

@@ -50,7 +50,7 @@ class WorkerStartEvent implements SwooleEvent
     */
    public function onActivate(): WorkerStartEvent {
        Console::info("Worker启动中");
-        Process::signal(SIGINT, function (){
+        Process::signal(SIGINT, function () {
            Console::warning("Server interrupted by keyboard.");
            ZMUtil::stop(true);
        });
@@ -61,16 +61,16 @@ class WorkerStartEvent implements SwooleEvent
        //设置炸毛buf中储存的对象
        ZMBuf::$globals = new GlobalConfig();
        ZMBuf::$config = [];
-        $file = scandir(WORKING_DIR . '/config/');
+        $file = scandir(DataProvider::getWorkingDir() . '/config/');
        unset($file[0], $file[1]);
        foreach ($file as $k => $v) {
            if ($v == "global.php") continue;
            $name = explode(".", $v);
            if (($prefix = end($name)) == "json") {
-                ZMBuf::$config[$name[0]] = json_decode(Co::readFile(WORKING_DIR . '/config/' . $v), true);
+                ZMBuf::$config[$name[0]] = json_decode(Co::readFile(DataProvider::getWorkingDir() . '/config/' . $v), true);
                Console::info("已读取配置文件：" . $v);
            } elseif ($prefix == "php") {
-                ZMBuf::$config[$name[0]] = include_once WORKING_DIR . '/config/' . $v;
+                ZMBuf::$config[$name[0]] = include_once DataProvider::getWorkingDir() . '/config/' . $v;
                if (is_array(ZMBuf::$config[$name[0]]))
                    Console::info("已读取配置文件：" . $v);
            }
@@ -98,7 +98,7 @@ class WorkerStartEvent implements SwooleEvent
            Coroutine::resume($v);
        }
        ZMBuf::unsetCache("wait_start");
-        foreach(ZMBuf::$events[OnStart::class] ?? [] as $v) {
+        foreach (ZMBuf::$events[OnStart::class] ?? [] as $v) {
            $class_name = $v->class;
            /** @var ModBase $class */
            $class = new $class_name(["server" => $this->server, "worker_id" => $this->worker_id], ModHandleType::SWOOLE_WORKER_START);
@@ -136,7 +136,7 @@ class WorkerStartEvent implements SwooleEvent
    private function loadAllClass() {
        //加载phar包
        Console::info("加载外部phar包中");
-        $dir = WORKING_DIR . "/resources/package/";
+        $dir = DataProvider::getWorkingDir() . "/resources/package/";
        if (is_dir($dir)) {
            $list = scandir($dir);
            unset($list[0], $list[1]);
@@ -147,8 +147,12 @@ class WorkerStartEvent implements SwooleEvent
        }

        //加载composer类
-        Console::info("加载composer资源中");
-        require_once WORKING_DIR . "/vendor/autoload.php";
+        if (file_exists(DataProvider::getWorkingDir() . "/vendor/autoload.php")) {
+            Console::info("加载composer资源中");
+            require_once DataProvider::getWorkingDir() . "/vendor/autoload.php";
+        } else {
+            if(isPharMode()) require_once WORKING_DIR . "/vendor/autoload.php";
+        }

        //加载各个模块的注解类，以及反射
        Console::info("检索Module中");
@@ -158,8 +162,8 @@ class WorkerStartEvent implements SwooleEvent
        ConnectionManager::registerCustomClass();

        //加载自定义的全局函数
-        if(file_exists(WORKING_DIR."/src/Custom/global_function.php"))
-            require_once WORKING_DIR."/src/Custom/global_function.php";
+        if (file_exists(DataProvider::getWorkingDir() . "/src/Custom/global_function.php"))
+            require_once DataProvider::getWorkingDir() . "/src/Custom/global_function.php";
        $this->afterCheck();
    }

@@ -175,7 +179,7 @@ class WorkerStartEvent implements SwooleEvent
     */
    private function afterCheck() {
        $context_class = ZMBuf::globals("context_class");
-        if(!is_a($context_class, ContextInterface::class, true)) {
+        if (!is_a($context_class, ContextInterface::class, true)) {
            throw new Exception("Context class must implemented from ContextInterface!");
        }
    }
--- a/src/ZM/Utils/DataProvider.php
+++ b/src/ZM/Utils/DataProvider.php
@@ -1,64 +0,0 @@
-<?php
-
-
-namespace ZM\Utils;
-
-
-use Co;
-use Framework\Console;
-use Framework\ZMBuf;
-
-class DataProvider
-{
-    public static $buffer_list = [];
-
-    public static function getResourceFolder()
-    {
-        return WORKING_DIR . '/resources/';
-    }
-
-    public static function getDataConfig()
-    {
-        return CONFIG_DIR;
-    }
-
-    public static function addSaveBuffer($buf_name, $sub_folder = null)
-    {
-        $name = ($sub_folder ?? "") . "/" . $buf_name . ".json";
-        self::$buffer_list[$buf_name] = $name;
-        ZMBuf::set($buf_name, self::getJsonData($name));
-    }
-
-    public static function saveBuffer()
-    {
-        $head = Console::setColor(date("[H:i:s] ") . "[V] Saving buffer......", "blue");
-        if (ZMBuf::$atomics["info_level"]->get() >= 3)
-            echo $head;
-        foreach (self::$buffer_list as $k => $v) {
-            self::setJsonData($v, ZMBuf::get($k));
-        }
-        if (ZMBuf::$atomics["info_level"]->get() >= 3)
-            echo Console::setColor("saved", "blue") . PHP_EOL;
-    }
-
-    public static function getFrameworkLink()
-    {
-        return ZMBuf::globals("http_reverse_link");
-    }
-
-    public static function getJsonData(string $string)
-    {
-        if (!file_exists(self::getDataConfig() . $string)) return [];
-        return json_decode(Co::readFile(self::getDataConfig() . $string), true);
-    }
-
-    private static function setJsonData($filename, array $args)
-    {
-        Co::writeFile(self::getDataConfig() . $filename, json_encode($args, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT | JSON_BIGINT_AS_STRING));
-    }
-
-    public static function getDataFolder()
-    {
-        return ZM_DATA;
-    }
-}
--- a/src/ZM/Utils/ZMUtil.php
+++ b/src/ZM/Utils/ZMUtil.php
@@ -6,6 +6,7 @@ namespace ZM\Utils;

 use Co;
 use framework\Console;
+use Framework\DataProvider;
 use Framework\ZMBuf;

 class ZMUtil