Merge pull request #2387 from visuddhinanda/development

Development

api-v13/app/Http/Controllers/AiAssistantController.php

@@ -22,7 +22,6 @@ class AiAssistantController extends Controller
         //
         $user = AuthService::current($request);
         if (!$user) {
-            Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
         }
         $resList = ShareApi::getResList($user['user_uid'], 8);

api-v13/app/Http/Controllers/AiModelController.php

@@ -25,7 +25,6 @@ class AiModelController extends Controller
         //
         $user = AuthService::current($request);
         if (!$user) {
-            Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
         }
         switch ($request->input('view')) {

api-v13/app/Http/Controllers/DiscussionController.php

@@ -304,7 +304,6 @@ class DiscussionController extends Controller
     {
         $user = AuthService::current($request);
         if (!$user) {
-            Log::error('discussion store auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), [401], 401);
         }
         //

api-v13/app/Http/Controllers/NotificationController.php

@@ -21,7 +21,6 @@ class NotificationController extends Controller
         //
         $user = AuthService::current($request);
         if (!$user) {
-            Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
         }
         switch ($request->input('view')) {
@@ -64,7 +63,6 @@ class NotificationController extends Controller
         //
         $user = AuthService::current($request);
         if (!$user) {
-            Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
         }
         $new = new Notification;

api-v13/app/Http/Controllers/PaliTextController.php

@@ -10,6 +10,7 @@ use App\Models\TagMap;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use App\Http\Resources\PaliTextResource;
+use App\Services\PaliTextService;
 
 class PaliTextController extends Controller
 {
@@ -196,28 +197,14 @@ class PaliTextController extends Controller
                     $books = BookTitle::where('title', $request->input('series'))->get();
                 } else {
                     //查询这个目录的顶级目录
-                    $path = PaliText::where('book', $request->input('book'))
-                        ->where('paragraph', $request->input('para'))
-                        ->select('path')->first();
-                    if (!$path) {
-                        return $this->error("no data");
-                    }
-                    $json = \json_decode($path->path);
-                    $root = null;
-                    foreach ($json as $key => $value) {
-                        # code...
-                        if ($value->level == 1) {
-                            $root = $value;
-                            break;
-                        }
-                    }
-                    if ($root === null) {
-                        return $this->error("no data");
-                    }
                     //查询书起始段落
-                    $rootPara = PaliText::where('book', $root->book)
-                        ->where('paragraph', $root->paragraph)
-                        ->first();
+                    $rootPara = app(PaliTextService::class)->getBookPara(
+                        $request->input('book'),
+                        $request->input('para')
+                    );
+                    if (!$rootPara) {
+                        return $this->error('no book', 404, 404);
+                    }
                     //获取丛书书名
                     $book_title = BookTitle::where('book', $rootPara->book)
                         ->where('paragraph', $rootPara->paragraph)

api-v13/app/Http/Controllers/ProjectController.php

@@ -23,7 +23,6 @@ class ProjectController extends Controller
     {
         $user = AuthService::current($request);
         if (!$user) {
-            Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
         }
         if ($request->has('studio')) {

api-v13/app/Http/Controllers/ProjectTreeController.php

@@ -32,7 +32,6 @@ class ProjectTreeController extends Controller
         //
         $user = AuthService::current($request);
         if (!$user) {
-            Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
         }
         $studioId = StudioApi::getIdByName($request->input('studio_name'));

api-v13/app/Http/Controllers/SysModelController.php

@@ -22,7 +22,6 @@ class SysModelController extends Controller
         //
         $user = AuthService::current($request);
         if (!$user) {
-            Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
         }
         $modelsId = Cache::get($this->key . $request->input('view', 'wbw'));
@@ -50,7 +49,6 @@ class SysModelController extends Controller
         //
         $user = AuthService::current($request);
         if (!$user) {
-            Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
         }
         Cache::put(

api-v13/app/Http/Controllers/TaskController.php

@@ -28,7 +28,6 @@ class TaskController extends Controller
         //
         $user = AuthService::current($request);
         if (!$user) {
-            Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
         }
 

api-v13/app/Services/PaliTextService.php

@@ -34,12 +34,11 @@ class PaliTextService
             ->where('paragraph', '<=', $para)
             ->where('level', 1)
             ->orderBy('paragraph', 'asc')->first();
-        if ($paragraph) {
-            return $paragraph;
-        } else {
-            Log::error('not found book ', ['book' => $book, 'para' => $para]);
+        if (!$paragraph) {
+            Log::warning('not found book ', ['book' => $book, 'para' => $para]);
             return null;
         }
+        return $paragraph;
     }
     public function getParaCategoryTags(int $book, int $para): array
     {