🎨 改进中间件

application/api/controller/Upload.php

@@ -10,6 +10,7 @@ namespace app\api\controller;
 
 use think\Db;
 use think\Exception;
+use think\exception\ErrorException;
 
 class Upload extends Base
 {
@@ -42,12 +43,18 @@ class Upload extends Base
         Db::startTrans();
         try {
 
-            $data = (new \app\index\controller\Upload)->execute($this->user);
+            $data = (new \app\common\controller\Upload)->exec();
 
             Db::commit();
         } catch (Exception $e) {
             Db::rollback();
             return $this->response($e->getMessage(), [], 500);
+        } catch (ErrorException $e) {
+            Db::rollback();
+            return $this->response($e->getMessage(), [], 500);
+        } catch (\Throwable $e) {
+            Db::rollback();
+            return $this->response($e->getMessage(), [], 500);
         }
         return $this->response('success', $data);
     }

application/http/middleware/ApiAuthenticate.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace app\http\middleware;
+
+use think\Request;
+
+class ApiAuthenticate
+{
+    public function handle(Request $request, \Closure $next)
+    {
+        $controller = $request->controller(true);
+        $action = $request->action(true);
+        $path = $controller . '/' . $action;
+
+        return $next($request);
+    }
+}

application/http/middleware/Initialize.php

@@ -2,30 +2,12 @@
 
 namespace app\http\middleware;
 
-use app\common\model\Users;
-use think\facade\Session;
 use think\Request;
 
 class Initialize
 {
-    /**
-     * 允许不登录访问的路径
-     *
-     * @var array
-     */
-    private $paths = [
-        'index/index',
-        'auth/login',
-        'auth/register',
-        'index/api'
-    ];
-
     public function handle(Request $request, \Closure $next)
     {
-        $controller = $request->controller(true);
-        $action = $request->action(true);
-        $path = $controller . '/' . $action;
-
         // 检测程序是否已安装
         if (!file_exists(app()->getAppPath() . 'install.lock')) {
             if ($request->controller(true) !== 'install' || $request->action(true) !== 'index') {
@@ -33,16 +15,7 @@ class Initialize
             }
         }
 
-        $user = null;
-        if ($uid = Session::get('uid')) {
-            $user = Users::get($uid);
-        }
-
-        if (!in_array($path, $this->paths) && !$user) {
-            return redirect(url('/auth/login'));
-        }
-
-        $request->user = $user;
+        // ...
 
         return $next($request);
     }

application/http/middleware/WebAuthenticate.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace app\http\middleware;
+
+use app\common\model\Users;
+use think\facade\Session;
+use think\Request;
+
+class WebAuthenticate
+{
+    /**
+     * 允许不登录访问的路径
+     *
+     * @var array
+     */
+    private $paths = [
+        'index/index',
+        'auth/login',
+        'auth/register',
+        'index/api'
+    ];
+
+    public function handle(Request $request, \Closure $next)
+    {
+        $controller = $request->controller(true);
+        $action = $request->action(true);
+        $path = $controller . '/' . $action;
+
+        $user = null;
+        if ($uid = Session::get('uid')) {
+            $user = Users::get($uid);
+        }
+
+        if (!in_array($path, $this->paths) && !$user) {
+            return redirect(url('/auth/login'));
+        }
+
+        $request->user = $user;
+
+        return $next($request);
+    }
+}

application/index/middleware.php

@@ -12,4 +12,7 @@
 // +----------------------------------------------------------------------
 // | 中间件配置
 // +----------------------------------------------------------------------
-return [app\http\middleware\Initialize::class];
+return [
+    app\http\middleware\Initialize::class,
+    app\http\middleware\WebAuthenticate::class
+];

application/index/view/auth/login.html

@@ -3,7 +3,7 @@
 {block name="title"}登录 - {$config.site_name}{/block}
 
 {block name="css"}
-  <link href="/static/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@4.4.1/dist/css/bootstrap.min.css" rel="stylesheet">
 {/block}
 
 {block name="main"}
@@ -49,5 +49,5 @@
 {/block}
 
 {block name="js"}
-<script src="/static/bootstrap/4.3.1/js/bootstrap.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.4.1/dist/js/bootstrap.min.js"></script>
 {/block}

application/index/view/auth/register.html

@@ -3,7 +3,7 @@
 {block name="title"}注册 - {$config.site_name}{/block}
 
 {block name="css"}
-  <link href="/static/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@4.4.1/dist/css/bootstrap.min.css" rel="stylesheet">
 {/block}
 
 {block name="main"}
@@ -67,5 +67,5 @@
 {/block}
 
 {block name="js"}
-<script src="/static/bootstrap/4.3.1/js/bootstrap.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.4.1/dist/js/bootstrap.min.js"></script>
 {/block}

config/middleware.php

@@ -12,6 +12,4 @@
 // +----------------------------------------------------------------------
 // | 中间件配置
 // +----------------------------------------------------------------------
-return [
-    'Initialize' => app\http\middleware\Initialize::class,
-];
+return [];

route/route.php

@@ -14,7 +14,7 @@ use think\facade\Route;
 Route::view('compatibility', 'index@tpl/compatibility');
 
 // [Api Route]
-Route::group('api', function () {
+Route::name('api')->group('api', function () {
     Route::any('token', 'api/Token/index');
     Route::any('upload', 'api/Upload/index');
     Route::any('image', 'api/Image/find');