update to build 386

fix ZM_DATA equals null
add containsImage, getImageCQFromLocal function for MessageUtil

src/ZM/ConsoleApplication.php

@@ -18,8 +18,8 @@ use ZM\Utils\DataProvider;
 
 class ConsoleApplication extends Application
 {
-    const VERSION_ID = 385;
-    const VERSION = "2.3.0";
+    const VERSION_ID = 386;
+    const VERSION = "2.3.0-beta1";
 
     public function __construct(string $name = 'UNKNOWN') {
         define("ZM_VERSION_ID", self::VERSION_ID);
@@ -54,7 +54,7 @@ class ConsoleApplication extends Application
                     $composer["autoload"]["psr-4"]["Custom\\"] = "src/Custom";
                     $r = file_put_contents(DataProvider::getWorkingDir() . "/composer.json", json_encode($composer, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
                     if ($r !== false) {
-                        echo "成功添加！请重新进行 composer update ！\n";
+                        echo "成功添加！请运行 composer dump-autoload ！\n";
                         exit(1);
                     } else {
                         echo "添加失败！请按任意键继续！";

src/ZM/Framework.php

@@ -45,14 +45,15 @@ class Framework
 
         self::$argv = $args;
 
-        //定义常量
-        include_once "global_defines.php";
-
         ZMConfig::setDirectory(DataProvider::getWorkingDir() . '/config');
         ZMConfig::setEnv($args["env"] ?? "");
         if (ZMConfig::get("global") === false) {
             die ("Global config load failed: " . ZMConfig::$last_error . "\nPlease init first!\n");
         }
+
+        //定义常量
+        include_once "global_defines.php";
+
         ZMAtomic::init();
         try {
             $sw = ZMConfig::get("global");
@@ -74,7 +75,6 @@ class Framework
             die($e->getMessage());
         }
         try {
-
             Console::init(
                 ZMConfig::get("global", "info_level") ?? 2,
                 self::$server,

src/ZM/Utils/MessageUtil.php

@@ -5,11 +5,19 @@ namespace ZM\Utils;
 
 
 use ZM\API\CQ;
+use ZM\Config\ZMConfig;
 use ZM\Console\Console;
+use ZM\Framework;
 use ZM\Requests\ZMRequest;
 
 class MessageUtil
 {
+    /**
+     * 下载消息中 CQ 码的所有图片，通过 url
+     * @param $msg
+     * @param null $path
+     * @return array|false
+     */
     public static function downloadCQImage($msg, $path = null) {
         $path = $path ?? DataProvider::getDataFolder() . "images/";
         if (!is_dir($path)) mkdir($path);
@@ -32,4 +40,41 @@ class MessageUtil
         }
         return $files;
     }
+
+    /**
+     * 检查消息中是否含有图片 CQ 码
+     * @param $msg
+     * @return bool
+     */
+    public static function containsImage($msg) {
+        $cq = CQ::getAllCQ($msg, true);
+        foreach ($cq as $v) {
+            if ($v->type == "image") {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 通过本地地址返回图片的 CQ 码
+     * type == 0 : 返回图片的 base64 CQ 码
+     * type == 1 : 返回图片的 file://路径 CQ 码（路径必须为绝对路径）
+     * type == 2 : 返回图片的 http://xxx CQ 码（默认为 /images/ 路径就是文件对应所在的目录）
+     * @param $file
+     * @param int $type
+     * @return string
+     */
+    public static function getImageCQFromLocal($file, $type = 0) {
+        switch ($type) {
+            case 0:
+                return CQ::image("base64://" . base64_encode(file_get_contents($file)));
+            case 1:
+                return CQ::image("file://" . $file);
+            case 2:
+                $info = pathinfo($file);
+                return CQ::image(ZMConfig::get("global", "http_reverse_link") . "/images/" . $info["basename"]);
+        }
+        return "";
+    }
 }

src/ZM/Utils/TaskManager.php

@@ -4,9 +4,15 @@
 namespace ZM\Utils;
 
 
+use ZM\Console\Console;
+
 class TaskManager
 {
     public static function runTask($task_name, $timeout = -1, ...$params) {
+        if (!isset(server()->setting["task_worker_num"])) {
+            Console::warning("未开启 TaskWorker 进程，请先修改 global 配置文件启用！");
+            return false;
+        }
         $r = server()->taskwait(["task" => $task_name, "params" => $params], $timeout);
         return $r === false ? false : $r["result"];
     }