2.0

hunzhiwange · Dec 1, 2024 · 9487990 · 9487990
1 parent f06b066
commit 9487990
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 69 deletions.
diff --git a/app/Controller/Home/Index.php b/app/Controller/Home/Index.php
@@ -18,17 +18,6 @@ class Index
      */
     public function handle(): string
     {
-//        go(function() {
-//            //sleep(100);
-//            //sleep(10);
-////            $fp = fopen('data.txt', 'a');//opens file in append mode
-////            fwrite($fp, '23424');
-////            fclose($fp);
-//
-//           // echo "File appended successfully";
-//        });
-//        return '3332222223';
-
-        return View::display('home');
+        return View::proxy()->display('home');
     }
 }
diff --git a/app/Infra/Helper/ForceCloseDebug.php b/app/Infra/Helper/ForceCloseDebug.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Infra\Helper;
+
+use Leevel\Config\Proxy\Config;
+use Leevel\Debug\Debug;
+
+/**
+ * 强制关闭调试模式.
+ */
+class ForceCloseDebug
+{
+    protected static bool $debug = false;
+
+    protected static bool $debugBar = false;
+
+    public static function handle(): void
+    {
+        static::$debug = (bool) Config::proxy()->get('debug');
+        Config::proxy()->set('debug', false);
+
+        $debugBar = static::getDebugBar();
+        static::$debugBar = $debugBar->getDebugStatus();
+        $debugBar->disable();
+    }
+
+    public static function restore(): void
+    {
+        Config::set('debug', static::$debug);
+
+        $debugBar = static::getDebugBar();
+        if (static::$debugBar) {
+            $debugBar->enable();
+        } else {
+            $debugBar->disable();
+        }
+    }
+
+    protected static function getDebugBar(): Debug
+    {
+        // @phpstan-ignore-next-line
+        return \App::proxy()->make(Debug::class);
+    }
+}
diff --git a/app/Infra/Provider/App.php b/app/Infra/Provider/App.php
@@ -4,11 +4,6 @@
 
 namespace App\Infra\Provider;
 
-use App\Infra\Module\Auth\Permission;
-use App\Infra\Module\Auth\PermissionCache;
-use Godruoyi\Snowflake\RedisSequenceResolver;
-use Godruoyi\Snowflake\Snowflake;
-use Leevel\Di\IContainer;
 use Leevel\Di\Provider;
 
 /**
@@ -21,9 +16,6 @@ class App extends Provider
      */
     public function register(): void
     {
-        $this->permission();
-        $this->redisSequence();
-        $this->snowflake();
     }
 
     /**
@@ -32,7 +24,6 @@ public function register(): void
     public static function providers(): array
     {
         return [
-            'permission',
             'redis_sequence',
             'snowflake',
         ];
@@ -52,42 +43,4 @@ public static function isDeferred(): bool
     public function bootstrap(): void
     {
     }
-
-    /**
-     * 注册 permission 服务.
-     */
-    private function permission(): void
-    {
-        $this->container->bind('permission', function (IContainer $container): Permission {
-            /** @var \Leevel\Http\Request $request */
-            $request = $container->make('request');
-            $token = $request->query->get('token', $request->request->get('token', ''));
-
-            // @phpstan-ignore-next-line
-            return new Permission($container->make(PermissionCache::class), $token);
-        });
-    }
-
-    private function redisSequence(): void
-    {
-        $this->container->singleton('redis_sequence', function (IContainer $container): RedisSequenceResolver {
-            $redis = redis_cache();
-
-            return (new RedisSequenceResolver($redis))->setCachePrefix('redis_sequence:');
-        });
-    }
-
-    private function snowflake(): void
-    {
-        $this->container->singleton('snowflake', function (IContainer $container): Snowflake {
-            $redis = redis_cache();
-            $redisSequence = (new RedisSequenceResolver($redis))->setCachePrefix('snowflake_redis_sequence:');
-
-            return (new Snowflake(1, 1))
-                // 1678032000000 = 2023-03-06
-                ->setStartTimeStamp(1678032000000)
-                ->setSequenceResolver($redisSequence)
-            ;
-        });
-    }
 }
diff --git a/app/Infra/Provider/Router.php b/app/Infra/Provider/Router.php
@@ -4,7 +4,6 @@
 
 namespace App\Infra\Provider;
 
-use App\Auth\Middleware\Auth;
 use Leevel\Router\RouterProvider;
 use Leevel\Session\Middleware\Session;
 
@@ -45,7 +44,6 @@ class Router extends RouterProvider
      * - 例外在应用执行结束后响应环节也会调用 HTTP 中间件.
      */
     protected array $middlewareAlias = [
-        'auth' => Auth::class,
         'session' => Session::class,
     ];
 
@@ -56,12 +54,6 @@ class Router extends RouterProvider
         'api/demo' => [
             'middlewares' => 'api',
         ],
-        'apiQL/v*' => [
-            'middlewares' => 'auth',
-        ],
-        '/app:*/apiQL/v*' => [
-            'middlewares' => 'auth',
-        ],
     ];
 
     /**
@@ -71,10 +63,10 @@ class Router extends RouterProvider
         'pet' => [],
         'store' => [],
         'user' => [],
-        '/apiQL/v1' => [
+        '/api/v1' => [
             'middlewares' => 'api',
         ],
-        'apiQL/v2' => [
+        'api/v2' => [
             'middlewares' => 'api',
         ],
         '/web/v1' => [