Merge pull request #14 from ichynul/main

使用容器时通过bind替换类，让`think\facade\Db`可正常使用

Author: walkor

composer.json

@@ -4,6 +4,7 @@
     "license": "MIT",
     "require": {
         "php": ">=8.1",
+        "topthink/think-container": "^2.0|^3.0",
         "topthink/think-orm": "^2.0.53 || ^3.0.0 || ^4.0.0 || dev-master",
         "workerman/webman-framework": "^2.1 || dev-master"
     },

src/DbManager.php

@@ -4,7 +4,6 @@
 
 namespace Webman\ThinkOrm;
 
-use Illuminate\Events\Dispatcher;
 use Webman\Context;
 use Workerman\Coroutine\Pool;
 use Throwable;

src/ThinkOrm.php

@@ -2,9 +2,11 @@
 
 namespace Webman\ThinkOrm;
 
+use think\Container;
 use think\Paginator;
 use support\think\Db;
 use Webman\Bootstrap;
+use support\think\Cache;
 
 class ThinkOrm implements Bootstrap
 {
@@ -28,13 +30,15 @@ public static function start($worker): void
             return;
         }
 
-        if (!class_exists(\think\facade\Db::class, false)) {
-            class_alias(\support\think\Db::class, \think\facade\Db::class);
-        }
+        Container::getInstance()->bind('think\DbManager', DbManager::class);
 
         // 配置
         Db::setConfig($config);
 
+        if (class_exists(Cache::class)) {
+            Db::setCache(Cache::store());
+        }
+
         Paginator::currentPageResolver(function ($pageName = 'page') {
             $request = request();
             if (!$request) {
@@ -48,7 +52,7 @@ class_alias(\support\think\Db::class, \think\facade\Db::class);
         });
 
         // 设置分页url中域名与参数之间的path字符串
-        Paginator::currentPathResolver(function (){
+        Paginator::currentPathResolver(function () {
             $request = request();
             return $request ? $request->path() : '/';
         });

src/support/think/Db.php

@@ -13,12 +13,14 @@
 namespace support\think;
 
 use think\db\BaseQuery;
-use think\Event;
 use think\Facade;
 use Webman\ThinkOrm\DbManager;
 
 /**
  * Class Db
+ * 
+ * @mixin DbManager
+ * 
  * 数据库操作类
  *
  * @method static BaseQuery name(string $name) 指定当前数据表名（不含前缀）
@@ -33,6 +35,7 @@
  * @method static BaseQuery connect(string|null $name = null, bool $force = false) 创建/切换数据库连接查询
  * @method static void setConfig($config) 设置配置对象
  * @method static mixed getConfig(string $name = '', $default = null) 获取配置参数
+ * @method static void setCache($config) 设置缓存对象
  * @method static void setEvent(Event $event) 设置Event对象
  * @method static void event(string $event, callable $callback) 注册回调方法
  * @method static mixed trigger(string $event, $params = null, bool $once = false) 触发事件