From 6fde28a2b8b13c53c3d939b7427acaec9b38a86e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= <lym125@gmail.com>
Date: Thu, 25 Nov 2021 14:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=AE=E5=BD=95=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/Http/Controllers/AdController.php     | 45 +++++++++++++++++++
 .../Http/Controllers}/CaptchaController.php   | 21 ++++-----
 .../Api/Http/Controllers/Controller.php       | 15 +++++++
 .../Api/Http/Controllers}/LoginController.php |  7 ++-
 .../Http/Controllers}/RegisterController.php  |  7 ++-
 .../Http/Controllers}/SmsCodeController.php   |  8 ++--
 .../Api/Http/Requests}/LoginRequest.php       |  2 +-
 .../Api/Http/Requests}/RegisterRequest.php    |  2 +-
 .../Api/Http/Requests/StoreCaptchaRequest.php | 32 +++++++++++++
 .../Http/Requests/StoreSmsCodeRequest.php}    |  4 +-
 .../Api}/Http/Resources/AdResource.php        |  8 ++--
 app/Endpoint/Api/routes.php                   | 21 +++++++++
 app/Http/Controllers/Api/V1/AdController.php  | 26 -----------
 app/Http/Controllers/Api/V1/Controller.php    |  9 ----
 app/Http/Resources/AdAddressResource.php      | 22 ---------
 app/Providers/RouteServiceProvider.php        |  2 +-
 routes/api.php                                | 12 -----
 routes/api/v1/auth.php                        |  8 ----
 routes/api/v1/common.php                      | 12 -----
 19 files changed, 141 insertions(+), 122 deletions(-)
 create mode 100644 app/Endpoint/Api/Http/Controllers/AdController.php
 rename app/{Http/Controllers/Api/V1 => Endpoint/Api/Http/Controllers}/CaptchaController.php (75%)
 create mode 100644 app/Endpoint/Api/Http/Controllers/Controller.php
 rename app/{Http/Controllers/Api/V1/Auth => Endpoint/Api/Http/Controllers}/LoginController.php (84%)
 rename app/{Http/Controllers/Api/V1/Auth => Endpoint/Api/Http/Controllers}/RegisterController.php (89%)
 rename app/{Http/Controllers/Api/V1 => Endpoint/Api/Http/Controllers}/SmsCodeController.php (84%)
 rename app/{Http/Requests/Api/V1 => Endpoint/Api/Http/Requests}/LoginRequest.php (93%)
 rename app/{Http/Requests/Api/V1 => Endpoint/Api/Http/Requests}/RegisterRequest.php (95%)
 create mode 100644 app/Endpoint/Api/Http/Requests/StoreCaptchaRequest.php
 rename app/{Http/Requests/Api/V1/SmsCode/StoreRequest.php => Endpoint/Api/Http/Requests/StoreSmsCodeRequest.php} (87%)
 rename app/{ => Endpoint/Api}/Http/Resources/AdResource.php (66%)
 create mode 100644 app/Endpoint/Api/routes.php
 delete mode 100644 app/Http/Controllers/Api/V1/AdController.php
 delete mode 100644 app/Http/Controllers/Api/V1/Controller.php
 delete mode 100644 app/Http/Resources/AdAddressResource.php
 delete mode 100644 routes/api.php
 delete mode 100644 routes/api/v1/auth.php
 delete mode 100644 routes/api/v1/common.php

diff --git a/app/Endpoint/Api/Http/Controllers/AdController.php b/app/Endpoint/Api/Http/Controllers/AdController.php
new file mode 100644
index 00000000..359be45b
--- /dev/null
+++ b/app/Endpoint/Api/Http/Controllers/AdController.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Endpoint\Api\Http\Controllers;
+
+use App\Endpoint\Api\Http\Resources\AdResource;
+use App\Models\AdAddress;
+use Illuminate\Http\Request;
+
+class AdController extends Controller
+{
+    /**
+     *
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return void
+     */
+    public function index(Request $request)
+    {
+        $keys = (array) $request->query('keys');
+
+        if (empty($keys)) {
+            return response()->json([]);
+        }
+
+        $addresses = AdAddress::with([
+            'ads' => function ($query) {
+                $query->showable()->latest('sort');
+            },
+        ])->showable()->whereIn('key', $keys)->get();
+
+        $mapAddresses = $addresses->mapWithKeys(function ($item) use ($request) {
+            return [
+                $item->key => AdResource::collection($item->ads)->resolve($request),
+            ];
+        });
+
+        foreach ($keys as $key) {
+            if (! $mapAddresses->has($key)) {
+                $mapAddresses->put($key, []);
+            }
+        }
+
+        return response()->json($mapAddresses);
+    }
+}
diff --git a/app/Http/Controllers/Api/V1/CaptchaController.php b/app/Endpoint/Api/Http/Controllers/CaptchaController.php
similarity index 75%
rename from app/Http/Controllers/Api/V1/CaptchaController.php
rename to app/Endpoint/Api/Http/Controllers/CaptchaController.php
index 7188be44..ea5280dc 100644
--- a/app/Http/Controllers/Api/V1/CaptchaController.php
+++ b/app/Endpoint/Api/Http/Controllers/CaptchaController.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Api\V1;
+namespace App\Endpoint\Api\Http\Controllers;
 
+use App\Endpoint\Api\Http\Requests\StoreCaptchaRequest;
 use App\Services\CaptchaService;
 use Gregwar\Captcha\CaptchaBuilder;
 use Illuminate\Http\Request;
@@ -12,23 +13,19 @@ class CaptchaController extends Controller
     /**
      * 创建图形验证码
      *
-     * @param \Illuminate\Http\Request $request
+     * @param \App\Endpoint\Api\Http\Requests\StoreCaptchaRequest $request
      * @param \App\Services\CaptchaService $captchaService
      * @return \Illuminate\Http\Response
      */
-    public function store(Request $request, CaptchaService $captchaService)
+    public function store(StoreCaptchaRequest $request, CaptchaService $captchaService)
     {
-        $key = $request->filled('key') ? $request->input('key') : Str::random(16);
-
         $builder = $this->builder();
-        $builder->build(
-            (int) $request->input('w', 150),
-            (int) $request->input('h', 40),
-        );
+        $builder->build($request->input('w', 150), $request->input('h', 40));
 
-        if (strlen($key) <= 32) {
-            $captchaService->put($key, $builder->getPhrase());
-        }
+        $captchaService->put(
+            $key = $request->input('key', Str::random(16)),
+            $builder->getPhrase()
+        );
 
         return response()->json([
             'key' => $key,
diff --git a/app/Endpoint/Api/Http/Controllers/Controller.php b/app/Endpoint/Api/Http/Controllers/Controller.php
new file mode 100644
index 00000000..f3c87001
--- /dev/null
+++ b/app/Endpoint/Api/Http/Controllers/Controller.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Endpoint\Api\Http\Controllers;
+
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller as BaseController;
+
+class Controller extends BaseController
+{
+    use AuthorizesRequests;
+    use DispatchesJobs;
+    use ValidatesRequests;
+}
diff --git a/app/Http/Controllers/Api/V1/Auth/LoginController.php b/app/Endpoint/Api/Http/Controllers/LoginController.php
similarity index 84%
rename from app/Http/Controllers/Api/V1/Auth/LoginController.php
rename to app/Endpoint/Api/Http/Controllers/LoginController.php
index 6c43f16a..4bb15ad7 100644
--- a/app/Http/Controllers/Api/V1/Auth/LoginController.php
+++ b/app/Endpoint/Api/Http/Controllers/LoginController.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Api\V1\Auth;
+namespace App\Endpoint\Api\Http\Controllers;
 
 use App\Constants\Device;
+use App\Endpoint\Api\Http\Requests\LoginRequest;
 use App\Exceptions\BizException;
-use App\Http\Controllers\Api\V1\Controller;
-use App\Http\Requests\Api\V1\LoginRequest;
 use App\Models\User;
 use App\Services\CaptchaService;
 
@@ -14,7 +13,7 @@ class LoginController extends Controller
     /**
      * 登录
      *
-     * @param \App\Http\Requests\Api\V1\LoginRequest $request
+     * @param \App\Endpoint\Api\Http\Requests\LoginRequest $request
      * @param \App\Services\CaptchaService $captchaService
      * @return \Illuminate\Http\JsonResponse
      */
diff --git a/app/Http/Controllers/Api/V1/Auth/RegisterController.php b/app/Endpoint/Api/Http/Controllers/RegisterController.php
similarity index 89%
rename from app/Http/Controllers/Api/V1/Auth/RegisterController.php
rename to app/Endpoint/Api/Http/Controllers/RegisterController.php
index be7d6a0e..b9df8fed 100644
--- a/app/Http/Controllers/Api/V1/Auth/RegisterController.php
+++ b/app/Endpoint/Api/Http/Controllers/RegisterController.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Api\V1\Auth;
+namespace App\Endpoint\Api\Http\Controllers;
 
 use App\Constants\Device;
+use App\Endpoint\Api\Http\Requests\RegisterRequest;
 use App\Exceptions\BizException;
-use App\Http\Controllers\Api\V1\Controller;
-use App\Http\Requests\Api\V1\RegisterRequest;
 use App\Models\SmsCode;
 use App\Models\User;
 use App\Models\UserInfo;
@@ -18,7 +17,7 @@ class RegisterController extends Controller
     /**
      * 注册
      *
-     * @param \App\Http\Requests\Api\V1\RegisterRequest $request
+     * @param \App\Endpoint\Api\Http\Requests\RegisterRequest $request
      * @param \App\Services\SmsCodeService $smsCodeService
      * @return \Illuminate\Http\JsonResponse
      */
diff --git a/app/Http/Controllers/Api/V1/SmsCodeController.php b/app/Endpoint/Api/Http/Controllers/SmsCodeController.php
similarity index 84%
rename from app/Http/Controllers/Api/V1/SmsCodeController.php
rename to app/Endpoint/Api/Http/Controllers/SmsCodeController.php
index 1da346b6..27e8d559 100644
--- a/app/Http/Controllers/Api/V1/SmsCodeController.php
+++ b/app/Endpoint/Api/Http/Controllers/SmsCodeController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Api\V1;
+namespace App\Endpoint\Api\Http\Controllers;
 
+use App\Endpoint\Api\Http\Requests\StoreSmsCodeRequest;
 use App\Exceptions\BizException;
-use App\Http\Requests\Api\V1\SmsCode\StoreRequest;
 use App\Services\CaptchaService;
 use App\Services\SmsCodeService;
 use Throwable;
@@ -13,7 +13,7 @@ class SmsCodeController extends Controller
     /**
      * 发送短信验证码
      *
-     * @param \App\Http\Requests\Api\V1\SmsCode\StoreRequest $request
+     * @param \App\Endpoint\Api\Http\Requests\StoreSmsCodeRequest $request
      * @param \App\Services\CaptchaService $captchaService
      * @param \App\Services\SmsCodeService $smsCodeService
      * @return \Illuminate\Http\Response
@@ -21,7 +21,7 @@ class SmsCodeController extends Controller
      * @throws \App\Exceptions\BizException
      */
     public function store(
-        StoreRequest $request,
+        StoreSmsCodeRequest $request,
         CaptchaService $captchaService,
         SmsCodeService $smsCodeService,
     ) {
diff --git a/app/Http/Requests/Api/V1/LoginRequest.php b/app/Endpoint/Api/Http/Requests/LoginRequest.php
similarity index 93%
rename from app/Http/Requests/Api/V1/LoginRequest.php
rename to app/Endpoint/Api/Http/Requests/LoginRequest.php
index a0994664..c2aed4fa 100644
--- a/app/Http/Requests/Api/V1/LoginRequest.php
+++ b/app/Endpoint/Api/Http/Requests/LoginRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Api\V1;
+namespace App\Endpoint\Api\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/Api/V1/RegisterRequest.php b/app/Endpoint/Api/Http/Requests/RegisterRequest.php
similarity index 95%
rename from app/Http/Requests/Api/V1/RegisterRequest.php
rename to app/Endpoint/Api/Http/Requests/RegisterRequest.php
index 1040d117..bb749747 100644
--- a/app/Http/Requests/Api/V1/RegisterRequest.php
+++ b/app/Endpoint/Api/Http/Requests/RegisterRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Api\V1;
+namespace App\Endpoint\Api\Http\Requests;
 
 use App\Models\User;
 use App\Rules\PhoneNumber;
diff --git a/app/Endpoint/Api/Http/Requests/StoreCaptchaRequest.php b/app/Endpoint/Api/Http/Requests/StoreCaptchaRequest.php
new file mode 100644
index 00000000..9b766a6e
--- /dev/null
+++ b/app/Endpoint/Api/Http/Requests/StoreCaptchaRequest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Endpoint\Api\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreCaptchaRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'key' => ['bail', 'filled', 'string', 'max:32'],
+            'w' => ['bail', 'int'],
+            'h' => ['bail', 'int'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Api/V1/SmsCode/StoreRequest.php b/app/Endpoint/Api/Http/Requests/StoreSmsCodeRequest.php
similarity index 87%
rename from app/Http/Requests/Api/V1/SmsCode/StoreRequest.php
rename to app/Endpoint/Api/Http/Requests/StoreSmsCodeRequest.php
index 12908329..398d1ff1 100644
--- a/app/Http/Requests/Api/V1/SmsCode/StoreRequest.php
+++ b/app/Endpoint/Api/Http/Requests/StoreSmsCodeRequest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Requests\Api\V1\SmsCode;
+namespace App\Endpoint\Api\Http\Requests;
 
 use App\Rules\PhoneNumber;
 use Illuminate\Foundation\Http\FormRequest;
 
-class StoreRequest extends FormRequest
+class StoreSmsCodeRequest extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
diff --git a/app/Http/Resources/AdResource.php b/app/Endpoint/Api/Http/Resources/AdResource.php
similarity index 66%
rename from app/Http/Resources/AdResource.php
rename to app/Endpoint/Api/Http/Resources/AdResource.php
index 5035e57b..c505c9a4 100644
--- a/app/Http/Resources/AdResource.php
+++ b/app/Endpoint/Api/Http/Resources/AdResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Endpoint\Api\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -15,9 +15,9 @@ class AdResource extends JsonResource
     public function toArray($request)
     {
         return [
-            'image'=>$this->image,
-            'jump_type'=>$this->jump_type,
-            'jump_link'=>$this->jump_link ?: '',
+            'image' => (string) $this->image,
+            'jump_type' => $this->jump_type,
+            'jump_link' => (string) $this->jump_link,
         ];
     }
 }
diff --git a/app/Endpoint/Api/routes.php b/app/Endpoint/Api/routes.php
new file mode 100644
index 00000000..a3162b9c
--- /dev/null
+++ b/app/Endpoint/Api/routes.php
@@ -0,0 +1,21 @@
+<?php
+
+use App\Endpoint\Api\Http\Controllers\AdController;
+use App\Endpoint\Api\Http\Controllers\CaptchaController;
+use App\Endpoint\Api\Http\Controllers\LoginController;
+use App\Endpoint\Api\Http\Controllers\RegisterController;
+use App\Endpoint\Api\Http\Controllers\SmsCodeController;
+use Illuminate\Support\Facades\Route;
+
+Route::group([
+    'prefix' => 'v1',
+], function () {
+    Route::post('captchas', [CaptchaController::class, 'store']);
+    Route::get('captchas/{captcha}', [CaptchaController::class, 'show']);
+    Route::post('sms-codes', [SmsCodeController::class, 'store']);
+
+    Route::post('login', LoginController::class);
+    Route::post('register', RegisterController::class);
+
+    Route::get('ads', [AdController::class, 'index']);
+});
diff --git a/app/Http/Controllers/Api/V1/AdController.php b/app/Http/Controllers/Api/V1/AdController.php
deleted file mode 100644
index fcd4b395..00000000
--- a/app/Http/Controllers/Api/V1/AdController.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\V1;
-
-use App\Http\Resources\AdAddressResource;
-use App\Models\AdAddress;
-use Illuminate\Http\Request;
-
-class AdController extends Controller
-{
-    public function index(Request $request)
-    {
-        $addreseKeys = (array) $request->input('address_key');
-
-        $list = AdAddress::with(['ads'=>function ($query) {
-            $query->where('is_show', 1)->orderBy('sort', 'desc');
-        }])->where('is_show', 1)->whereIn('key', $addreseKeys)->get();
-
-        $data = [];
-        foreach ($addreseKeys as $key) {
-            $data[$key] = [];
-        }
-        $data = array_merge($data, array_column(AdAddressResource::collection($list)->toArray($request), 'ads', 'key'));
-        return $data;
-    }
-}
diff --git a/app/Http/Controllers/Api/V1/Controller.php b/app/Http/Controllers/Api/V1/Controller.php
deleted file mode 100644
index 77e6cdc6..00000000
--- a/app/Http/Controllers/Api/V1/Controller.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\V1;
-
-use App\Http\Controllers\Controller as BaseController;
-
-class Controller extends BaseController
-{
-}
diff --git a/app/Http/Resources/AdAddressResource.php b/app/Http/Resources/AdAddressResource.php
deleted file mode 100644
index fb5c31d2..00000000
--- a/app/Http/Resources/AdAddressResource.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class AdAddressResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
-     */
-    public function toArray($request)
-    {
-        return [
-            'key' => $this->key,
-            'ads' => AdResource::collection($this->ads),
-        ];
-    }
-}
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 3bd3c81e..620fa261 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -41,7 +41,7 @@ class RouteServiceProvider extends ServiceProvider
             Route::prefix('api')
                 ->middleware('api')
                 ->namespace($this->namespace)
-                ->group(base_path('routes/api.php'));
+                ->group(app_path('Endpoint/Api/routes.php'));
 
             Route::middleware('web')
                 ->namespace($this->namespace)
diff --git a/routes/api.php b/routes/api.php
deleted file mode 100644
index 9f44fd55..00000000
--- a/routes/api.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Route;
-
-Route::group([
-    'prefix' => 'v1',
-], function () {
-    foreach (File::allFiles(base_path('routes/api/v1')) as $file) {
-        require $file;
-    }
-});
diff --git a/routes/api/v1/auth.php b/routes/api/v1/auth.php
deleted file mode 100644
index 804161aa..00000000
--- a/routes/api/v1/auth.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-use App\Http\Controllers\Api\V1\Auth\LoginController;
-use App\Http\Controllers\Api\V1\Auth\RegisterController;
-use Illuminate\Support\Facades\Route;
-
-Route::post('login', LoginController::class);
-Route::post('register', RegisterController::class);
diff --git a/routes/api/v1/common.php b/routes/api/v1/common.php
deleted file mode 100644
index 5e5d30cc..00000000
--- a/routes/api/v1/common.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-use App\Http\Controllers\Api\V1\AdController;
-use App\Http\Controllers\Api\V1\CaptchaController;
-use App\Http\Controllers\Api\V1\SmsCodeController;
-use Illuminate\Support\Facades\Route;
-
-Route::post('captchas', [CaptchaController::class, 'store']);
-Route::get('captchas/{captcha}', [CaptchaController::class, 'show']);
-
-Route::post('sms-codes', [SmsCodeController::class, 'store']);
-Route::get('ads', [AdController::class, 'index']);