Merge branch 'dev' of http://git.ruanyiit.com/liuxiaomin/loveisland into dev

addons/shopro/controller/commission/Ranking.php

@@ -14,90 +14,71 @@ class Ranking extends Commission
 
     /**
      * 佣金排行榜
-     * 按用户表佣金字段排序
+     * 按已结算佣金金额排序
      */
     public function commission()
     {
         $limit = $this->request->param('limit', 20);
         $timeType = $this->request->param('time_type', 'all'); // all|month|week|day
 
-        // 从User表直接读取commission字段
-        $query = UserModel::field([
-            'id as user_id',
-            'nickname',
-            'avatar',
-            'commission as total_commission'
+        $query = RewardModel::field([
+            'agent_id',
+            'sum(commission) as total_commission',
+            'count(distinct order_id) as order_count'
         ])
-            ->where('commission', '>', 0)
-            ->where('status', 'normal');
-
-        // 时间筛选（根据佣金记录计算时间范围内的佣金）
-        if ($timeType !== 'all') {
-            // 查询在时间范围内有佣金记录的用户
-            $rewardQuery = RewardModel::field('agent_id')
-                ->where('status', RewardModel::COMMISSION_REWARD_STATUS_ACCOUNTED);
-
-            switch ($timeType) {
-                case 'month':
-                    $rewardQuery->whereTime('commission_time', 'month');
-                    break;
-                case 'week':
-                    $rewardQuery->whereTime('commission_time', 'week');
-                    break;
-                case 'day':
-                    $rewardQuery->whereTime('commission_time', 'today');
-                    break;
-            }
+            ->where('status', RewardModel::COMMISSION_REWARD_STATUS_ACCOUNTED)
+            ->group('agent_id');
 
-            $agentIds = $rewardQuery->group('agent_id')->column('agent_id');
-            $query->whereIn('id', $agentIds);
+        // 时间筛选
+        switch ($timeType) {
+            case 'month':
+                $query->whereTime('commission_time', 'month');
+                break;
+            case 'week':
+                $query->whereTime('commission_time', 'week');
+                break;
+            case 'day':
+                $query->whereTime('commission_time', 'today');
+                break;
         }
 
-        $rankings = $query->order('commission', 'desc')
+        $rankings = $query->order('total_commission', 'desc')
             ->limit($limit)
             ->select();
 
         if (empty($rankings)) {
-            $this->success('获取成功', [
-                'list' => [],
-                'current_user_rank' => null
-            ]);
+            $this->success('获取成功', []);
+        }
+
+        $agentIds = array_column($rankings, 'agent_id');
+
+        // 获取用户信息（排除已删除用户）
+        $users = UserModel::whereIn('id', $agentIds)
+            ->where('status', 'normal')
+            ->field('id, nickname, avatar')
+            ->select();
+
+        $userMap = [];
+        if (is_array($users)) {
+            $userMap = array_column($users, null, 'id');
+        } else {
+            $userMap = $users->column(null, 'id');
         }
 
         $result = [];
         foreach ($rankings as $index => $item) {
-            // 查询订单数量
-            $orderCount = 0;
-            if ($timeType !== 'all') {
-                $orderQuery = RewardModel::where('agent_id', $item['user_id'])
-                    ->where('status', RewardModel::COMMISSION_REWARD_STATUS_ACCOUNTED);
-
-                switch ($timeType) {
-                    case 'month':
-                        $orderQuery->whereTime('commission_time', 'month');
-                        break;
-                    case 'week':
-                        $orderQuery->whereTime('commission_time', 'week');
-                        break;
-                    case 'day':
-                        $orderQuery->whereTime('commission_time', 'today');
-                        break;
-                }
-
-                $orderCount = $orderQuery->count('distinct order_id');
-            } else {
-                $orderCount = RewardModel::where('agent_id', $item['user_id'])
-                    ->where('status', RewardModel::COMMISSION_REWARD_STATUS_ACCOUNTED)
-                    ->count('distinct order_id');
+            $user = $userMap[$item->agent_id] ?? null;
+            // 跳过已删除的用户
+            if (!$user) {
+                continue;
             }
-
             $result[] = [
-                'rank' => $index + 1,
-                'user_id' => $item['user_id'],
-                'nickname' => $item['nickname'] ?: '匿名用户',
-                'avatar' => $item['avatar'] ?: '',
-                'total_commission' => round($item['total_commission'], 2),
-                'order_count' => $orderCount
+                'rank' => count($result) + 1,
+                'user_id' => $item->agent_id,
+                'nickname' => $user ? $user->nickname : '匿名用户',
+                'avatar' => $user ? $user->avatar : '',
+                'total_commission' => round($item->total_commission, 2),
+                'order_count' => $item->order_count
             ];
         }
 
@@ -203,63 +184,65 @@ class Ranking extends Commission
             }
         }
 
-        // 查询当前用户信息
-        $user = UserModel::get($userId);
-        if (!$user || $user->commission <= 0) {
-            return null;
+        // 查询当前用户的佣金
+        $query = RewardModel::where('agent_id', $userId)
+            ->where('status', RewardModel::COMMISSION_REWARD_STATUS_ACCOUNTED);
+
+        switch ($timeType) {
+            case 'month':
+                $query->whereTime('commission_time', 'month');
+                break;
+            case 'week':
+                $query->whereTime('commission_time', 'week');
+                break;
+            case 'day':
+                $query->whereTime('commission_time', 'today');
+                break;
         }
 
-        $totalCommission = $user->commission;
-
-        // 时间筛选时，检查用户是否有对应时间范围内的佣金记录
-        if ($timeType !== 'all') {
-            $query = RewardModel::where('agent_id', $userId)
-                ->where('status', RewardModel::COMMISSION_REWARD_STATUS_ACCOUNTED);
-
-            switch ($timeType) {
-                case 'month':
-                    $query->whereTime('commission_time', 'month');
-                    break;
-                case 'week':
-                    $query->whereTime('commission_time', 'week');
-                    break;
-                case 'day':
-                    $query->whereTime('commission_time', 'today');
-                    break;
-            }
+        $totalCommission = $query->sum('commission');
+        $orderCount = $query->count('distinct order_id');
 
-            if (!$query->find()) {
-                return null;
-            }
+        if ($totalCommission <= 0) {
+            return null;
         }
 
-        // 查询订单数量
-        $orderQuery = RewardModel::where('agent_id', $userId)
-            ->where('status', RewardModel::COMMISSION_REWARD_STATUS_ACCOUNTED);
-
-        if ($timeType !== 'all') {
-            switch ($timeType) {
-                case 'month':
-                    $orderQuery->whereTime('commission_time', 'month');
-                    break;
-                case 'week':
-                    $orderQuery->whereTime('commission_time', 'week');
-                    break;
-                case 'day':
-                    $orderQuery->whereTime('commission_time', 'today');
-                    break;
-            }
+        // 计算排名（排除已删除用户）
+        $rankWhereQuery = RewardModel::where('status', RewardModel::COMMISSION_REWARD_STATUS_ACCOUNTED);
+        switch ($timeType) {
+            case 'month':
+                $rankWhereQuery->whereTime('commission_time', 'month');
+                break;
+            case 'week':
+                $rankWhereQuery->whereTime('commission_time', 'week');
+                break;
+            case 'day':
+                $rankWhereQuery->whereTime('commission_time', 'today');
+                break;
         }
 
-        $orderCount = $orderQuery->count('distinct order_id');
+        // 只统计正常状态用户的佣金
+        $rank = $rankWhereQuery->group('agent_id')
+            ->having('sum(commission) > ' . $totalCommission)
+            ->select();
 
-        // 计算排名：统计佣金大于当前用户的人数
-        $rank = UserModel::where('commission', '>', $totalCommission)
-            ->where('status', 'normal')
-            ->count() + 1;
+        // 过滤掉已删除的用户
+        $validRank = 0;
+        if ($rank) {
+            $rankIds = array_column($rank, 'agent_id');
+            $validUsers = UserModel::whereIn('id', $rankIds)
+                ->where('status', 'normal')
+                ->column('id');
+            $validRank = count($validUsers);
+        }
+
+        $user = UserModel::where('id', $userId)->where('status', 'normal')->find();
+        if (!$user) {
+            return null;
+        }
 
         return [
-            'rank' => $rank,
+            'rank' => $validRank + 1,
             'user_id' => $userId,
             'nickname' => $user->nickname ?: '我',
             'avatar' => $user->avatar ?: '',

addons/shopro/controller/company/Company.php

@@ -34,8 +34,8 @@ class Company extends Common
      */
     public function store_list()
     {
-        $page   = $this->request->get('page') ?? 1;  //页码
-        $limit  = $this->request->get('limit') ?? 10; //每页显示条数
+        $page = $this->request->get('page') ?? 1;  //页码
+        $limit = $this->request->get('limit') ?? 10; //每页显示条数
         $storeList = Store::where('status', 'normal')
             ->field('id,store_name,store_logo,detail_address,phone,longitude,latitude,store_intro')
             ->order('weigh', 'desc')
@@ -50,13 +50,15 @@ class Company extends Common
      */
     public function technology_list()
     {
-        $page   = $this->request->get('page') ?? 1;  //页码
-        $limit  = $this->request->get('limit') ?? 3; //每页显示条数
-
+        $limit = $this->request->get('limit') ?? 3; //每页显示条数
+        if ($limit < 1) {
+            $limit = 1;
+        }
         $technologyList = CompanyTechnology::where('status', 'normal')
             ->field('id,tech_name,tech_image,tech_desc')
             ->order('weigh', 'desc')
-            ->paginate(["page" => $page, "list_rows" => $limit]);
+            ->limit($limit)
+            ->select();
 
         return $this->success('成功', $technologyList);
     }

application/extra/chat.php

+<?php
+
+return [
+  'application' => [
+    'shop' => [
+      'room_id' => 'admin',
+    ],
+  ],
+  'basic' => [
+    'allocate' => 'busy',
+    'auto_customer_service' => '1',
+    'last_customer_service' => '1',
+  ],
+  'system' => [
+    'inside_host' => '127.0.0.1',
+    'inside_port' => '9292',
+    'port' => '2222',
+    'ssl' => 'reverse_proxy',
+    'ssl_cert' => '',
+    'ssl_key' => '',
+  ],
+];
\ No newline at end of file

thinkphp/composer.json

@@ -17,7 +17,10 @@
     ],
     "require": {
         "php": ">=7.1.0",
-        "topthink/think-installer": "~1.0"
+        "topthink/think-installer": "~1.0",
+        "ext-fileinfo": "*",
+        "ext-mbstring": "*",
+        "ext-json": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "4.8.*",

thinkphp/library/think/App.php

@@ -74,7 +74,7 @@ class App
      * @return Response
      * @throws Exception
      */
-    public static function run(Request $request = null)
+    public static function run(?Request $request = null)
     {
         $request = is_null($request) ? Request::instance() : $request;
 

thinkphp/library/think/Collection.php

@@ -263,7 +263,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
      * @param callable|null $callback 回调函数
      * @return static
      */
-    public function filter(callable $callback = null)
+    public function filter(?callable $callback = null)
     {
         return new static(array_filter($this->items, $callback ?: null));
     }
@@ -317,7 +317,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
      * @param  callable|null $callback 回调函数
      * @return static
      */
-    public function sort(callable $callback = null)
+    public function sort(?callable $callback = null)
     {
         $items    = $this->items;
         $callback = $callback ?: function ($a, $b) {

thinkphp/library/think/Controller.php

@@ -50,7 +50,7 @@ class Controller
      * @access public
      * @param Request $request Request 对象
      */
-    public function __construct(Request $request = null)
+    public function __construct(?Request $request = null)
     {
         $this->view    = View::instance(Config::get('template'), Config::get('view_replace_str'));
         $this->request = is_null($request) ? Request::instance() : $request;

thinkphp/library/think/File.php

@@ -150,12 +150,19 @@ class File extends SplFileObject
      */
     protected function checkPath($path)
     {
-        if (is_dir($path) || mkdir($path, 0755, true)) {
+        if (is_dir($path)) {
             return true;
         }
 
-        $this->error = ['directory {:path} creation failed', ['path' => $path]];
+        if (@mkdir($path, 0755, true)) {
+            return true;
+        }
 
+        if (is_dir($path)) {
+            return true;
+        }
+
+        $this->error = ['directory {:path} creation failed', ['path' => $path]];
         return false;
     }
 

thinkphp/library/think/Model.php

@@ -537,6 +537,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
             list($type, $param) = explode(':', $type, 2);
         }
         switch ($type) {
+            case 'string':
+            case 'bigint':
+                $value = (string) $value;
+                break;
+            case 'int':
             case 'integer':
                 $value = (int) $value;
                 break;
@@ -547,6 +552,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
                     $value = (float) number_format($value, $param, '.', '');
                 }
                 break;
+            case 'bool':
             case 'boolean':
                 $value = (bool) $value;
                 break;
@@ -670,6 +676,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
             list($type, $param) = explode(':', $type, 2);
         }
         switch ($type) {
+            case 'string':
+            case 'bigint':
+                $value = (string) $value;
+                break;
+            case 'int':
             case 'integer':
                 $value = (int) $value;
                 break;
@@ -680,6 +691,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
                     $value = (float) number_format($value, $param, '.', '');
                 }
                 break;
+            case 'bool':
             case 'boolean':
                 $value = (bool) $value;
                 break;

thinkphp/library/think/Process.php

@@ -123,7 +123,7 @@ class Process
      * @throws \RuntimeException
      * @api
      */
-    public function __construct($commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = [])
+    public function __construct($commandline, $cwd = null, ?array $env = null, $input = null, $timeout = 60, array $options = [])
     {
         if (!function_exists('proc_open')) {
             throw new \RuntimeException('The Process class relies on proc_open, which is not available on your PHP installation.');

thinkphp/library/think/Request.php

@@ -521,19 +521,24 @@ class Request
             // 获取原始请求类型
             return $this->server('REQUEST_METHOD') ?: 'GET';
         } elseif (!$this->method) {
-            if (isset($_POST[Config::get('var_method')])) {
-                $method = strtoupper($_POST[Config::get('var_method')]);
+            $varMethod = Config::get('var_method');
+            if ($varMethod && isset($_POST[$varMethod])) {
+                $method = strtoupper($_POST[$varMethod]);
                 if (in_array($method, ['GET', 'POST', 'DELETE', 'PUT', 'PATCH'])) {
                     $this->method = $method;
                     $this->{$this->method}($_POST);
                 } else {
                     $this->method = 'POST';
                 }
-                unset($_POST[Config::get('var_method')]);
-            } elseif (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
-                $this->method = strtoupper($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']);
+                unset($_POST[$varMethod]);
             } else {
-                $this->method = $this->server('REQUEST_METHOD') ?: 'GET';
+                $method = $this->server('REQUEST_METHOD') ?: 'GET';
+                $httpMethodOverride = strtoupper($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ?? '');
+                if ($method === 'POST' && in_array($httpMethodOverride, ['GET', 'POST', 'DELETE', 'PUT', 'PATCH'])) {
+                    $this->method = $httpMethodOverride;
+                } else {
+                    $this->method = $method;
+                }
             }
         }
         return $this->method;

thinkphp/library/think/console/Command.php

@@ -72,7 +72,7 @@ class Command
      * 设置控制台
      * @param Console $console
      */
-    public function setConsole(Console $console = null)
+    public function setConsole(?Console $console = null)
     {
         $this->console = $console;
     }

thinkphp/library/think/console/output/formatter/Stack.php

@@ -28,7 +28,7 @@ class Stack
      * 构造方法
      * @param Style|null $emptyStyle
      */
-    public function __construct(Style $emptyStyle = null)
+    public function __construct(?Style $emptyStyle = null)
     {
         $this->emptyStyle = $emptyStyle ?: new Style();
         $this->reset();
@@ -57,7 +57,7 @@ class Stack
      * @return Style
      * @throws \InvalidArgumentException
      */
-    public function pop(Style $style = null)
+    public function pop(?Style $style = null)
     {
         if (empty($this->styles)) {
             return $this->emptyStyle;

thinkphp/library/think/db/Connection.php

@@ -406,7 +406,7 @@ abstract class Connection
      * @throws PDOException
      * @throws \Exception
      */
-    public function execute($sql, $bind = [], Query $query = null)
+    public function execute($sql, $bind = [], ?Query $query = null)
     {
         $this->initConnect(true);
         if (!$this->linkID) {
@@ -483,7 +483,7 @@ abstract class Connection
             if (PDO::PARAM_STR == $type) {
                 $value = $this->quote($value);
             } elseif (PDO::PARAM_INT == $type) {
-                $value = (float) $value;
+                $value = sprintf("%d", $value);
             }
             // 判断占位符
             $sql = is_numeric($key) ?
@@ -738,7 +738,7 @@ abstract class Connection
      * @param array $sqlArray SQL批处理指令
      * @return boolean
      */
-    public function batchQuery($sqlArray = [], $bind = [], Query $query = null)
+    public function batchQuery($sqlArray = [], $bind = [], ?Query $query = null)
     {
         if (!is_array($sqlArray)) {
             return false;

thinkphp/library/think/db/Query.php

@@ -62,7 +62,7 @@ class Query
      * @param Connection $connection 数据库对象实例
      * @param Model      $model      模型对象
      */
-    public function __construct(Connection $connection = null, $model = null)
+    public function __construct(?Connection $connection = null, $model = null)
     {
         $this->connection = $connection ?: Db::connect([], true);
         $this->prefix     = $this->connection->getConfig('prefix');

thinkphp/library/think/exception/HttpException.php

@@ -16,7 +16,7 @@ class HttpException extends \RuntimeException
     private $statusCode;
     private $headers;
 
-    public function __construct($statusCode, $message = null, \Exception $previous = null, array $headers = [], $code = 0)
+    public function __construct($statusCode, $message = null, ?\Exception $previous = null, array $headers = [], $code = 0)
     {
         $this->statusCode = $statusCode;
         $this->headers    = $headers;

thinkphp/library/think/model/relation/MorphTo.php

@@ -137,10 +137,11 @@ class MorphTo extends Relation
 
     /**
      * 移除关联查询参数
+     * @param true $option
      * @access public
      * @return $this
      */
-    public function removeOption()
+    public function removeOption($option = true)
     {
         return $this;
     }

thinkphp/library/think/process/pipes/Windows.php

@@ -49,7 +49,7 @@ class Windows extends Pipes
         if (is_resource($input)) {
             $this->input = $input;
         } else {
-            $this->inputBuffer = $input;
+            $this->inputBuffer = (string) $input;
         }
     }
 

thinkphp/tests/thinkphp/library/think/controller/.gitignore

-*
+*
 !.gitignore
\ No newline at end of file

thinkphp/tests/thinkphp/library/think/db/driver/.gitignore

-*
+*
 !.gitignore
\ No newline at end of file

thinkphp/tests/thinkphp/library/think/model/.gitignore

-*
+*
 !.gitignore
\ No newline at end of file

thinkphp/tests/thinkphp/library/think/session/.gitignore

-*
+*
 !.gitignore
\ No newline at end of file

thinkphp/tests/thinkphp/library/think/template/driver/.gitignore

-*
+*
 !.gitignore
\ No newline at end of file

thinkphp/tests/thinkphp/library/think/view/driver/.gitignore

-*
+*
 !.gitignore
\ No newline at end of file

vendor/autoload.php

@@ -2,24 +2,6 @@
 
 // autoload.php @generated by Composer
 
-if (PHP_VERSION_ID < 50600) {
-    if (!headers_sent()) {
-        header('HTTP/1.1 500 Internal Server Error');
-    }
-    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    if (!ini_get('display_errors')) {
-        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
-            fwrite(STDERR, $err);
-        } elseif (!headers_sent()) {
-            echo $err;
-        }
-    }
-    trigger_error(
-        $err,
-        E_USER_ERROR
-    );
-}
-
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitf3106b6ef3260b6914241eab0bed11c1::getLoader();

vendor/composer/ClassLoader.php

@@ -42,79 +42,30 @@ namespace Composer\Autoload;
  */
 class ClassLoader
 {
-    /** @var \Closure(string):void */
-    private static $includeFile;
-
-    /** @var ?string */
     private $vendorDir;
 
     // PSR-4
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<string, int>>
-     */
     private $prefixLengthsPsr4 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<int, string>>
-     */
     private $prefixDirsPsr4 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, string>
-     */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<string, string[]>>
-     */
     private $prefixesPsr0 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, string>
-     */
     private $fallbackDirsPsr0 = array();
 
-    /** @var bool */
     private $useIncludePath = false;
-
-    /**
-     * @var string[]
-     * @psalm-var array<string, string>
-     */
     private $classMap = array();
-
-    /** @var bool */
     private $classMapAuthoritative = false;
-
-    /**
-     * @var bool[]
-     * @psalm-var array<string, bool>
-     */
     private $missingClasses = array();
-
-    /** @var ?string */
     private $apcuPrefix;
 
-    /**
-     * @var self[]
-     */
     private static $registeredLoaders = array();
 
-    /**
-     * @param ?string $vendorDir
-     */
     public function __construct($vendorDir = null)
     {
         $this->vendorDir = $vendorDir;
-        self::initializeIncludeClosure();
     }
 
-    /**
-     * @return string[]
-     */
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -124,47 +75,28 @@ class ClassLoader
         return array();
     }
 
-    /**
-     * @return array[]
-     * @psalm-return array<string, array<int, string>>
-     */
     public function getPrefixesPsr4()
     {
         return $this->prefixDirsPsr4;
     }
 
-    /**
-     * @return array[]
-     * @psalm-return array<string, string>
-     */
     public function getFallbackDirs()
     {
         return $this->fallbackDirsPsr0;
     }
 
-    /**
-     * @return array[]
-     * @psalm-return array<string, string>
-     */
     public function getFallbackDirsPsr4()
     {
         return $this->fallbackDirsPsr4;
     }
 
-    /**
-     * @return string[] Array of classname => path
-     * @psalm-return array<string, string>
-     */
     public function getClassMap()
     {
         return $this->classMap;
     }
 
     /**
-     * @param string[] $classMap Class to filename map
-     * @psalm-param array<string, string> $classMap
-     *
-     * @return void
+     * @param array $classMap Class to filename map
      */
     public function addClassMap(array $classMap)
     {
@@ -179,11 +111,9 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string          $prefix  The prefix
-     * @param string[]|string $paths   The PSR-0 root directories
-     * @param bool            $prepend Whether to prepend the directories
-     *
-     * @return void
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
      */
     public function add($prefix, $paths, $prepend = false)
     {
@@ -226,13 +156,11 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string          $prefix  The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths   The PSR-4 base directories
-     * @param bool            $prepend Whether to prepend the directories
+     * @param string       $prefix  The prefix/namespace, with trailing '\\'
+     * @param array|string $paths   The PSR-4 base directories
+     * @param bool         $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
-     *
-     * @return void
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
@@ -276,10 +204,8 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string          $prefix The prefix
-     * @param string[]|string $paths  The PSR-0 base directories
-     *
-     * @return void
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
      */
     public function set($prefix, $paths)
     {
@@ -294,12 +220,10 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string          $prefix The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths  The PSR-4 base directories
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
-     *
-     * @return void
      */
     public function setPsr4($prefix, $paths)
     {
@@ -319,8 +243,6 @@ class ClassLoader
      * Turns on searching the include path for class files.
      *
      * @param bool $useIncludePath
-     *
-     * @return void
      */
     public function setUseIncludePath($useIncludePath)
     {
@@ -343,8 +265,6 @@ class ClassLoader
      * that have not been registered with the class map.
      *
      * @param bool $classMapAuthoritative
-     *
-     * @return void
      */
     public function setClassMapAuthoritative($classMapAuthoritative)
     {
@@ -365,8 +285,6 @@ class ClassLoader
      * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
      *
      * @param string|null $apcuPrefix
-     *
-     * @return void
      */
     public function setApcuPrefix($apcuPrefix)
     {
@@ -387,8 +305,6 @@ class ClassLoader
      * Registers this instance as an autoloader.
      *
      * @param bool $prepend Whether to prepend the autoloader or not
-     *
-     * @return void
      */
     public function register($prepend = false)
     {
@@ -408,8 +324,6 @@ class ClassLoader
 
     /**
      * Unregisters this instance as an autoloader.
-     *
-     * @return void
      */
     public function unregister()
     {
@@ -424,18 +338,15 @@ class ClassLoader
      * Loads the given class or interface.
      *
      * @param  string    $class The name of the class
-     * @return true|null True if loaded, null otherwise
+     * @return bool|null True if loaded, null otherwise
      */
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            $includeFile = self::$includeFile;
-            $includeFile($file);
+            includeFile($file);
 
             return true;
         }
-
-        return null;
     }
 
     /**
@@ -490,11 +401,6 @@ class ClassLoader
         return self::$registeredLoaders;
     }
 
-    /**
-     * @param  string       $class
-     * @param  string       $ext
-     * @return string|false
-     */
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
@@ -560,26 +466,14 @@ class ClassLoader
 
         return false;
     }
+}
 
-    /**
-     * @return void
-     */
-    private static function initializeIncludeClosure()
-    {
-        if (self::$includeFile !== null) {
-            return;
-        }
-
-        /**
-         * Scope isolated include.
-         *
-         * Prevents access to $this/self from included files.
-         *
-         * @param  string $file
-         * @return void
-         */
-        self::$includeFile = \Closure::bind(static function($file) {
-            include $file;
-        }, null, null);
-    }
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+    include $file;
 }

vendor/composer/autoload_classmap.php

@@ -2,7 +2,7 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(

vendor/composer/autoload_files.php

@@ -2,21 +2,21 @@
 
 // autoload_files.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
     'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
-    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
+    '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
     '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
-    '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
+    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
     '0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
-    '2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
+    '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
     '9b552a3cc426e3287cc811caefa3cf53' => $vendorDir . '/topthink/think-helper/src/helper.php',
-    'f7e3d8cd19cf23ce3883a6a51d791b77' => $vendorDir . '/fastadminnet/fastadmin-addons/src/common.php',
+    '2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
     'f0e7e63bbb278a92db02393536748c5f' => $vendorDir . '/overtrue/wechat/src/Kernel/Support/Helpers.php',
     '6747f579ad6817f318cc3a7e7a0abb93' => $vendorDir . '/overtrue/wechat/src/Kernel/Helpers.php',
     '1cfd2761b63b0a29ed23657ea394cb2d' => $vendorDir . '/topthink/think-captcha/src/helper.php',
     'cc56288302d9df745d97c934d6a6e5f0' => $vendorDir . '/topthink/think-queue/src/common.php',
+    'f7e3d8cd19cf23ce3883a6a51d791b77' => $vendorDir . '/fastadminnet/fastadmin-addons/src/common.php',
 );

vendor/composer/autoload_namespaces.php

@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(

vendor/composer/autoload_psr4.php

@@ -2,16 +2,17 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
     'think\\helper\\' => array($vendorDir . '/topthink/think-helper/src'),
     'think\\composer\\' => array($vendorDir . '/topthink/think-installer/src'),
     'think\\captcha\\' => array($vendorDir . '/topthink/think-captcha/src'),
-    'think\\' => array($vendorDir . '/fastadminnet/fastadmin-addons/src', $baseDir . '/thinkphp/library/think', $vendorDir . '/topthink/think-queue/src'),
+    'think\\' => array($baseDir . '/thinkphp/library/think', $vendorDir . '/topthink/think-queue/src', $vendorDir . '/fastadminnet/fastadmin-addons/src'),
     'addons\\' => array($baseDir . '/addons'),
     'ZipStream\\' => array($vendorDir . '/maennchen/zipstream-php/src'),
+    'Workerman\\' => array($vendorDir . '/workerman/workerman'),
     'Tx\\' => array($vendorDir . '/fastadminnet/fastadmin-mailer/src'),
     'Symfony\\Polyfill\\Php80\\' => array($vendorDir . '/symfony/polyfill-php80'),
     'Symfony\\Polyfill\\Php73\\' => array($vendorDir . '/symfony/polyfill-php73'),
@@ -34,6 +35,7 @@ return array(
     'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
     'PhpZip\\' => array($vendorDir . '/nelexa/zip/src'),
     'PhpOffice\\PhpSpreadsheet\\' => array($vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet'),
+    'PHPSocketIO\\' => array($vendorDir . '/workerman/phpsocket.io/src'),
     'Overtrue\\Socialite\\' => array($vendorDir . '/overtrue/socialite/src'),
     'Overtrue\\Pinyin\\' => array($vendorDir . '/overtrue/pinyin/src'),
     'MyCLabs\\Enum\\' => array($vendorDir . '/myclabs/php-enum/src'),
@@ -46,4 +48,5 @@ return array(
     'EasyWeChatComposer\\' => array($vendorDir . '/easywechat-composer/easywechat-composer/src'),
     'Composer\\Pcre\\' => array($vendorDir . '/composer/pcre/src'),
     'Complex\\' => array($vendorDir . '/markbaker/complex/classes/src'),
+    'Channel\\' => array($vendorDir . '/workerman/channel/src'),
 );

vendor/composer/autoload_real.php

@@ -25,26 +25,51 @@ class ComposerAutoloaderInitf3106b6ef3260b6914241eab0bed11c1
         require __DIR__ . '/platform_check.php';
 
         spl_autoload_register(array('ComposerAutoloaderInitf3106b6ef3260b6914241eab0bed11c1', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
         spl_autoload_unregister(array('ComposerAutoloaderInitf3106b6ef3260b6914241eab0bed11c1', 'loadClassLoader'));
 
-        require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitf3106b6ef3260b6914241eab0bed11c1::getInitializer($loader));
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+        if ($useStaticLoader) {
+            require __DIR__ . '/autoload_static.php';
 
-        $loader->register(true);
+            call_user_func(\Composer\Autoload\ComposerStaticInitf3106b6ef3260b6914241eab0bed11c1::getInitializer($loader));
+        } else {
+            $map = require __DIR__ . '/autoload_namespaces.php';
+            foreach ($map as $namespace => $path) {
+                $loader->set($namespace, $path);
+            }
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInitf3106b6ef3260b6914241eab0bed11c1::$files;
-        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
-            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+            $map = require __DIR__ . '/autoload_psr4.php';
+            foreach ($map as $namespace => $path) {
+                $loader->setPsr4($namespace, $path);
+            }
 
-                require $file;
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
             }
-        }, null, null);
-        foreach ($filesToLoad as $fileIdentifier => $file) {
-            $requireFile($fileIdentifier, $file);
+        }
+
+        $loader->register(true);
+
+        if ($useStaticLoader) {
+            $includeFiles = Composer\Autoload\ComposerStaticInitf3106b6ef3260b6914241eab0bed11c1::$files;
+        } else {
+            $includeFiles = require __DIR__ . '/autoload_files.php';
+        }
+        foreach ($includeFiles as $fileIdentifier => $file) {
+            composerRequiref3106b6ef3260b6914241eab0bed11c1($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
+
+function composerRequiref3106b6ef3260b6914241eab0bed11c1($fileIdentifier, $file)
+{
+    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+        require $file;
+
+        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+    }
+}

vendor/composer/autoload_static.php

@@ -7,19 +7,19 @@ namespace Composer\Autoload;
 class ComposerStaticInitf3106b6ef3260b6914241eab0bed11c1
 {
     public static $files = array (
-        '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
         'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
-        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
+        '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
         '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
-        '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
+        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php',
-        '2cffec82183ee1cea088009cef9a6fc3' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
+        '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
         '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
-        'f7e3d8cd19cf23ce3883a6a51d791b77' => __DIR__ . '/..' . '/fastadminnet/fastadmin-addons/src/common.php',
+        '2cffec82183ee1cea088009cef9a6fc3' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
         'f0e7e63bbb278a92db02393536748c5f' => __DIR__ . '/..' . '/overtrue/wechat/src/Kernel/Support/Helpers.php',
         '6747f579ad6817f318cc3a7e7a0abb93' => __DIR__ . '/..' . '/overtrue/wechat/src/Kernel/Helpers.php',
         '1cfd2761b63b0a29ed23657ea394cb2d' => __DIR__ . '/..' . '/topthink/think-captcha/src/helper.php',
         'cc56288302d9df745d97c934d6a6e5f0' => __DIR__ . '/..' . '/topthink/think-queue/src/common.php',
+        'f7e3d8cd19cf23ce3883a6a51d791b77' => __DIR__ . '/..' . '/fastadminnet/fastadmin-addons/src/common.php',
     );
 
     public static $prefixLengthsPsr4 = array (
@@ -38,6 +38,10 @@ class ComposerStaticInitf3106b6ef3260b6914241eab0bed11c1
         array (
             'ZipStream\\' => 10,
         ),
+        'W' => 
+        array (
+            'Workerman\\' => 10,
+        ),
         'T' => 
         array (
             'Tx\\' => 3,
@@ -68,6 +72,7 @@ class ComposerStaticInitf3106b6ef3260b6914241eab0bed11c1
             'Psr\\Cache\\' => 10,
             'PhpZip\\' => 7,
             'PhpOffice\\PhpSpreadsheet\\' => 25,
+            'PHPSocketIO\\' => 12,
         ),
         'O' => 
         array (
@@ -95,6 +100,7 @@ class ComposerStaticInitf3106b6ef3260b6914241eab0bed11c1
         array (
             'Composer\\Pcre\\' => 14,
             'Complex\\' => 8,
+            'Channel\\' => 8,
         ),
     );
 
@@ -113,9 +119,9 @@ class ComposerStaticInitf3106b6ef3260b6914241eab0bed11c1
         ),
         'think\\' => 
         array (
-            0 => __DIR__ . '/..' . '/fastadminnet/fastadmin-addons/src',
-            1 => __DIR__ . '/../..' . '/thinkphp/library/think',
-            2 => __DIR__ . '/..' . '/topthink/think-queue/src',
+            0 => __DIR__ . '/../..' . '/thinkphp/library/think',
+            1 => __DIR__ . '/..' . '/topthink/think-queue/src',
+            2 => __DIR__ . '/..' . '/fastadminnet/fastadmin-addons/src',
         ),
         'addons\\' => 
         array (
@@ -125,6 +131,10 @@ class ComposerStaticInitf3106b6ef3260b6914241eab0bed11c1
         array (
             0 => __DIR__ . '/..' . '/maennchen/zipstream-php/src',
         ),
+        'Workerman\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/workerman/workerman',
+        ),
         'Tx\\' => 
         array (
             0 => __DIR__ . '/..' . '/fastadminnet/fastadmin-mailer/src',
@@ -214,6 +224,10 @@ class ComposerStaticInitf3106b6ef3260b6914241eab0bed11c1
         array (
             0 => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet',
         ),
+        'PHPSocketIO\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/workerman/phpsocket.io/src',
+        ),
         'Overtrue\\Socialite\\' => 
         array (
             0 => __DIR__ . '/..' . '/overtrue/socialite/src',
@@ -262,6 +276,10 @@ class ComposerStaticInitf3106b6ef3260b6914241eab0bed11c1
         array (
             0 => __DIR__ . '/..' . '/markbaker/complex/classes/src',
         ),
+        'Channel\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/workerman/channel/src',
+        ),
     );
 
     public static $prefixesPsr0 = array (

vendor/easywechat-composer/easywechat-composer/composer.json

@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
+        "php": ">=7.1",
         "composer-plugin-api": "^1.0 || ^2.0"
     },
     "require-dev": {

vendor/easywechat-composer/easywechat-composer/src/ManifestManager.php

@@ -39,7 +39,7 @@ class ManifestManager
      * @param string      $vendorPath
      * @param string|null $manifestPath
      */
-    public function __construct(string $vendorPath, string $manifestPath = null)
+    public function __construct(string $vendorPath, ?string $manifestPath = null)
     {
         $this->vendorPath = $vendorPath;
         $this->manifestPath = $manifestPath ?: $vendorPath.'/easywechat-composer/easywechat-composer/extensions.php';

vendor/ezyang/htmlpurifier/VERSION

-4.18.0
\ No newline at end of file
+4.19.0
\ No newline at end of file

vendor/ezyang/htmlpurifier/composer.json

@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
+        "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0"
     },
     "require-dev": {
         "cerdic/css-tidy": "^1.7 || ^2.0",