From fe5a665c0827652280579970afd1f98cf50880b4 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Thu, 15 Sep 2022 10:39:01 +0800
Subject: [PATCH] update keywords

---
 .../KeywordsController.php                    | 19 +------------
 .../src/Http/Api/KeywordsController.php       | 27 +++++++++++++++++++
 .../src/Http/Resources/KeywordResource.php    |  2 ++
 packages/keywords/src/Http/routes.php         |  2 +-
 packages/keywords/src/Http/web.php            |  6 ++---
 5 files changed, 34 insertions(+), 22 deletions(-)
 rename packages/keywords/src/Http/{Controllers => Admin}/KeywordsController.php (82%)
 create mode 100644 packages/keywords/src/Http/Api/KeywordsController.php

diff --git a/packages/keywords/src/Http/Controllers/KeywordsController.php b/packages/keywords/src/Http/Admin/KeywordsController.php
similarity index 82%
rename from packages/keywords/src/Http/Controllers/KeywordsController.php
rename to packages/keywords/src/Http/Admin/KeywordsController.php
index f5af163..2e7a13c 100644
--- a/packages/keywords/src/Http/Controllers/KeywordsController.php
+++ b/packages/keywords/src/Http/Admin/KeywordsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Peidikeji\Keywords\Http\Controllers;
+namespace Peidikeji\Keywords\Http\Admin;
 
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
@@ -8,7 +8,6 @@ use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Show;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
-use Peidikeji\Keywords\Http\Resources\KeywordResource;
 use Peidikeji\Keywords\Models\Keywords;
 
 class KeywordsController extends AdminController
@@ -29,22 +28,6 @@ class KeywordsController extends AdminController
         return $list;
     }
 
-    public function json(Request $request)
-    {
-        $query = Keywords::filter($request->all());
-
-        $list = $query->get();
-
-        return response()->json(['code' => 200, 'data' => KeywordResource::collection($list), 'message' => '']);
-    }
-
-    public function jsonOne($key)
-    {
-        $info = Keywords::where('key', $key)->firstOrFail();
-
-        return response()->json(['code' => 200, 'data' => KeywordResource::make($info), 'message' => '']);
-    }
-
     protected function grid()
     {
         return Grid::make(new Keywords(), function ($grid) {
diff --git a/packages/keywords/src/Http/Api/KeywordsController.php b/packages/keywords/src/Http/Api/KeywordsController.php
new file mode 100644
index 0000000..f48abda
--- /dev/null
+++ b/packages/keywords/src/Http/Api/KeywordsController.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Peidikeji\Keywords\Http\Api;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Peidikeji\Keywords\Http\Resources\KeywordResource;
+use Peidikeji\Keywords\Models\Keywords;
+
+class KeywordsController extends Controller
+{
+    public function index(Request $request)
+    {
+        $query = Keywords::filter($request->all());
+
+        $list = $query->get();
+
+        return $this->json(KeywordResource::collection($list));
+    }
+
+    public function show($key)
+    {
+        $info = Keywords::where(fn($q) => $q->where('key', $key)->orWhere('id', $key))->firstOrFail();
+
+        return $this->json(KeywordResource::make($info));
+    }
+}
diff --git a/packages/keywords/src/Http/Resources/KeywordResource.php b/packages/keywords/src/Http/Resources/KeywordResource.php
index e911669..552f313 100644
--- a/packages/keywords/src/Http/Resources/KeywordResource.php
+++ b/packages/keywords/src/Http/Resources/KeywordResource.php
@@ -20,6 +20,8 @@ class KeywordResource extends JsonResource
             'key' => $this->key,
             'type_key' => $this->type_key,
             'value' => $this->value,
+            'parent_id' => $this->parent_id,
+            'level' => $this->level,
         ];
     }
 }
diff --git a/packages/keywords/src/Http/routes.php b/packages/keywords/src/Http/routes.php
index f596189..459fcfb 100644
--- a/packages/keywords/src/Http/routes.php
+++ b/packages/keywords/src/Http/routes.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Peidikeji\Keywords\Http\Controllers;
+namespace Peidikeji\Keywords\Http\Admin;
 
 use Illuminate\Support\Facades\Route;
 
diff --git a/packages/keywords/src/Http/web.php b/packages/keywords/src/Http/web.php
index ac876a1..7a6f40e 100644
--- a/packages/keywords/src/Http/web.php
+++ b/packages/keywords/src/Http/web.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Peidikeji\Keywords\Http\Controllers;
+namespace Peidikeji\Keywords\Http\Api;
 
 use Illuminate\Support\Facades\Route;
 
 Route::group(['middleware' => 'api', 'prefix' => 'api'], function () {
-    Route::get('keywords', [KeywordsController::class, 'json']);
-    Route::get('keywords/{key}', [KeywordsController::class, 'jsonOne']);
+    Route::get('keywords', [KeywordsController::class, 'index']);
+    Route::get('keywords/{key}', [KeywordsController::class, 'show']);
 });