fix:更新已知bug,优化代码

vendor/webman/think-orm/src/ThinkOrm.php

@@ -4,9 +4,11 @@ namespace Webman\ThinkOrm;
 
 use Webman\Bootstrap;
 use Workerman\Timer;
+use Throwable;
 use think\Paginator;
 use think\facade\Db;
-use think\db\connector\Mysql;
+use think\DbManager;
+use think\Container;
 
 class ThinkOrm implements Bootstrap
 {
@@ -14,36 +16,60 @@ class ThinkOrm implements Bootstrap
     public static function start($worker)
     {
         $config = config('thinkorm');
-        $default = $config['default'] ?? false;
-        $connections = $config['connections'] ?? [];
         // 配置
         Db::setConfig($config);
         // 维持mysql心跳
         if ($worker) {
-            Timer::add(55, function () use ($connections, $default) {
-                if (!class_exists(Mysql::class, false)) {
-                    return;
-                }
-                foreach ($connections as $key => $item) {
-                    if ($item['type'] == 'mysql') {
+            if (class_exists(Container::class, false)) {
+                $manager_instance = Container::getInstance()->make(DbManager::class);
+            } else {
+                $reflect = new \ReflectionClass(Db::class);
+                $property = $reflect->getProperty('instance');
+                $property->setAccessible(true);
+                $manager_instance = $property->getValue();
+            }
+            Timer::add(55, function () use ($manager_instance) {
+                $reflect = new \ReflectionClass($manager_instance);
+                $property = $reflect->getProperty('instance');
+                $property->setAccessible(true);
+                $instances  = $property->getValue($manager_instance);
+                foreach ($instances as $connection) {
+                    /* @var \think\db\connector\Mysql $connection */
+                    if ($connection->getConfig('type') == 'mysql') {
                         try {
-                            if ($key == $default) {
-                                Db::query('select 1');
-                            } else {
-                                Db::connect($key)->query('select 1');
-                            }
+                            $connection->query('select 1');
                         } catch (Throwable $e) {}
                     }
                 }
                 Db::getDbLog(true);
             });
         }
+
+        // 自定义分页组件类
+        $bootstrap = $config['connections'][$config['default']]['bootstrap'] ?? false;
+        if($bootstrap && class_exists($bootstrap)){
+            Paginator::maker(function ($items, $listRows, $currentPage, $total, $simple, $options) use ($bootstrap){
+                return (new \ReflectionClass($bootstrap))->newInstanceArgs(func_get_args());
+            });
+        }
+
+
         Paginator::currentPageResolver(function ($pageName = 'page') {
-            $page = request()->input($pageName, 1);
+            $request = request();
+            if (!$request) {
+                return 1;
+            }
+            $page = $request->input($pageName, 1);
             if (filter_var($page, FILTER_VALIDATE_INT) !== false && (int)$page >= 1) {
                 return (int)$page;
             }
             return 1;
         });
+
+        // 设置分页url中域名与参数之间的path字符串
+        Paginator::currentPathResolver(function (){
+            $request = request();
+            return $request ? $request->path() : '/';
+        });
     }
 }

vendor/webman/think-orm/src/config/thinkorm.php

@@ -17,7 +17,10 @@ return [
             // 数据库连接端口
             'hostport' => '3306',
             // 数据库连接参数
-            'params' => [],
+            'params' => [
+                // 连接超时3秒
+                \PDO::ATTR_TIMEOUT => 3,
+            ],
             // 数据库编码默认采用utf8
             'charset' => 'utf8',
             // 数据库表前缀
@@ -26,6 +29,8 @@ return [
             'break_reconnect' => true,
             // 关闭SQL监听日志
             'trigger_sql' => false,
+            // 自定义分页类
+            'bootstrap' =>  ''
         ],
     ],
-];
+];