auth static move to AuthService

api-v13/app/Console/Commands/UpgradeAITerm.php

@@ -7,9 +7,9 @@ use Illuminate\Console\Command;
 use App\Services\AIModelService;
 use App\Services\TermService;
 use App\Services\AIAssistant\AITermService;
+use App\Services\AuthService;
 
 use App\Http\Resources\AiModelResource;
-use App\Http\Controllers\AuthController;
 
 
 class UpgradeAITerm extends Command
@@ -62,7 +62,7 @@ class UpgradeAITerm extends Command
         $this->aiTermService->setModel($modelId);
         $this->model = $this->modelService->getModelById($modelId);
         $this->info("model:{$this->model['model']}");
-        $this->modelToken = AuthController::getUserToken($modelId);
+        $this->modelToken = AuthService::getUserToken($modelId);
 
         if ($this->option('id')) {
             $terms = [['guid' => $this->option('id'), 'word' => 'word']];

api-v13/app/Console/Commands/UpgradeAITranslation.php

@@ -10,9 +10,9 @@ use App\Services\AIModelService;
 use App\Services\SentenceService;
 use App\Services\SearchPaliDataService;
 use App\Services\AIAssistant\NissayaTranslateService;
+use App\Services\AuthService;
 
 use App\Http\Resources\AiModelResource;
-use App\Http\Controllers\AuthController;
 
 use App\Models\PaliText;
 use App\Models\PaliSentence;
@@ -75,7 +75,7 @@ class UpgradeAITranslation extends Command
         if ($this->option('model')) {
             $this->model = $this->modelService->getModelById($this->option('model'));
             $this->info("model:{$this->model['model']}");
-            $this->modelToken = AuthController::getUserToken($this->model['uid']);
+            $this->modelToken = AuthService::getUserToken($this->model['uid']);
         }
         $this->workChannel = ChannelApi::getById($this->ask('请输入结果channel'));
 

api-v13/app/Http/Api/AiTaskPrepare.php

@@ -12,7 +12,7 @@ use App\Http\Api\Mq;
 use App\Http\Api\ChannelApi;
 
 use Illuminate\Support\Facades\Log;
-use App\Http\Controllers\AuthController;
+use App\Services\AuthService;
 
 class AiTaskPrepare
 {
@@ -114,7 +114,7 @@ class AiTaskPrepare
 
         # ai model
         $aiModel = AiModel::findOrFail($task->executor_id);
-        $modelToken = AuthController::getUserToken($aiModel->uid);
+        $modelToken = AuthService::getUserToken($aiModel->uid);
         $aiModel['token'] = $modelToken;
         $sumLen = 0;
         $mqData = [];

api-v13/app/Http/Api/AuthApi.php

@@ -7,41 +7,4 @@ use Illuminate\Http\Request;
 use Firebase\JWT\JWT;
 use Firebase\JWT\Key;
 
-class AuthApi
-{
-    public static function getJwtKey()
-    {
-        return config('mint.app.jwt_secrets_key');
-    }
-    public static function getToken(Request $request)
-    {
-        $token = $request->bearerToken();
-        return $token;
-    }
-    public static function current(Request $request)
-    {
-        $token = $request->bearerToken();
-        if ($token) {
-            try {
-
-                $jwt = JWT::decode($token, new Key(self::getJwtKey(), 'HS512'));
-            } catch (\Exception $e) {
-                return false;
-            }
-            if ($jwt->exp < time()) {
-                //过期
-                return false;
-            } else {
-                //有效的token
-                return ['user_uid' => $jwt->uid, 'user_id' => $jwt->id];
-            }
-        } else if (isset($_COOKIE['user_uid'])) {
-            return [
-                'user_uid' => $_COOKIE['user_uid'],
-                'user_id' => $_COOKIE['user_id']
-            ];
-        } else {
-            return false;
-        }
-    }
-}
+class AuthApi {}

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

@@ -8,7 +8,7 @@ use Illuminate\Support\Str;
 use Firebase\JWT\JWT;
 use Firebase\JWT\Key;
 use Illuminate\Support\Facades\Log;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\ChannelApi;
 
 class AccessTokenController extends Controller
@@ -33,7 +33,7 @@ class AccessTokenController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             Log::error('未登录');
             return $this->error(__('auth.failed'), [], 401);

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

@@ -5,7 +5,7 @@ namespace App\Http\Controllers;
 use App\Models\AiModel;
 use Illuminate\Http\Request;
 use App\Http\Resources\AiAssistantResource;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\ShareApi;
 
 use Illuminate\Support\Facades\Log;
@@ -20,7 +20,7 @@ class AiAssistantController extends Controller
     public function index(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);

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

@@ -6,7 +6,7 @@ use App\Http\Requests\StoreAiModelRequest;
 use App\Http\Requests\UpdateAiModelRequest;
 use App\Models\AiModel;
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Log;
 use App\Http\Api\StudioApi;
@@ -23,7 +23,7 @@ class AiModelController extends Controller
     public function index(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
@@ -76,7 +76,7 @@ class AiModelController extends Controller
     public function store(StoreAiModelRequest $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -117,7 +117,7 @@ class AiModelController extends Controller
     public function update(UpdateAiModelRequest $request, AiModel $aiModel)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -145,7 +145,7 @@ class AiModelController extends Controller
     public function destroy(Request $request, AiModel $aiModel)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }

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

@@ -15,7 +15,7 @@ use App\Models\CustomBookId;
 use App\Models\Sentence;
 
 use App\Http\Resources\ArticleResource;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\ShareApi;
 use App\Http\Api\StudioApi;
 use App\Http\Api\ChannelApi;
@@ -165,7 +165,7 @@ class ArticleController extends Controller
                 break;
             case 'studio':
                 # 获取studio内所有 article
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'), [], 401);
                 }
@@ -245,7 +245,7 @@ class ArticleController extends Controller
      */
     public function showMyNumber(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -276,7 +276,7 @@ class ArticleController extends Controller
     public function store(Request $request)
     {
         //判断权限
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             Log::error('未登录');
             return $this->error(__('auth.failed'), [], 401);
@@ -433,7 +433,7 @@ class ArticleController extends Controller
             return $this->error("no recorder");
         }
         //判断权限
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             $user_uid = "";
         } else {
@@ -460,7 +460,7 @@ class ArticleController extends Controller
             return $this->error("no recorder");
         }
         //判断权限
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             $user_uid = "";
         } else {
@@ -493,7 +493,7 @@ class ArticleController extends Controller
             return $this->error("no recorder");
         }
         //鉴权
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         } else {
@@ -550,7 +550,7 @@ class ArticleController extends Controller
     public function destroy(Request $request, Article $article)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }

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

@@ -6,7 +6,7 @@ use App\Models\ArticleCollection;
 use App\Models\Article;
 use App\Models\Collection;
 use App\Http\Api\ShareApi;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use Illuminate\Http\Request;
 use App\Http\Resources\ArticleMapResource;
 use Illuminate\Support\Facades\Log;
@@ -91,7 +91,7 @@ class ArticleMapController extends Controller
             return $this->error("no recorder");
         }
         //鉴权
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -167,7 +167,7 @@ class ArticleMapController extends Controller
             return $this->error("no recorder");
         }
         //鉴权
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }

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

@@ -8,7 +8,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\App;
 
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 use App\Http\Resources\AttachmentResource;
 use App\Models\Attachment;
@@ -30,7 +30,7 @@ class AttachmentController extends Controller
         //
         switch ($request->input('view')) {
             case 'studio':
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -72,7 +72,7 @@ class AttachmentController extends Controller
      */
     public function store(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -209,7 +209,7 @@ class AttachmentController extends Controller
     public function update(Request $request, Attachment $attachment)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -228,7 +228,7 @@ class AttachmentController extends Controller
     public function destroy(Request $request, string $id)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }

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

@@ -5,11 +5,10 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use App\Models\UserInfo;
 use Firebase\JWT\JWT;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\App;
-use App\Http\Api\UserApi;
-use App\Http\Api\AiAssistantApi;
+
 use Illuminate\Support\Facades\Log;
 
 class AuthController extends Controller
@@ -84,7 +83,7 @@ class AuthController extends Controller
         $user = $query->first();
         if ($user) {
             $ExpTime = time() + 60 * 60 * 24 * 365;
-            $key = AuthApi::getJwtKey();
+            $key = AuthService::getJwtKey();
             $payload = [
                 'nbf' => time(),
                 'exp' => $ExpTime,
@@ -101,30 +100,11 @@ class AuthController extends Controller
         }
     }
 
-    public static function getUserToken($userUid)
-    {
-        $user = UserApi::getByUuid($userUid);
-        if (!$user) {
-            $user = AiAssistantApi::getByUuid($userUid);
-        }
-        if ($user) {
-            $ExpTime = time() + 60 * 60 * 24 * 365;
-            $key = AuthApi::getJwtKey();
-            $payload = [
-                'nbf' => time(),
-                'exp' => $ExpTime,
-                'uid' => $user['id'],
-                'id' => $user['sn'],
-            ];
-            $jwt = JWT::encode($payload, $key, 'HS512');
-            return $jwt;
-        }
-        return null;
-    }
+
 
     public function getUserInfoByToken(Request $request)
     {
-        $curr = AuthApi::current($request);
+        $curr = AuthService::current($request);
         if (!$curr) {
             Log::warning('invalid token');
             return $this->error('invalid token', 401, 401);

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

@@ -16,7 +16,7 @@ use App\Models\CustomBook;
 
 use App\Http\Resources\ChannelResource;
 
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 use App\Http\Api\ShareApi;
 use App\Http\Api\PaliTextApi;
@@ -62,7 +62,7 @@ class ChannelController extends Controller
                 break;
             case 'studio':
                 # 获取studio内所有channel
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -95,7 +95,7 @@ class ChannelController extends Controller
                  * studio 的和协作的
                  */
                 #获取user所有有权限的channel列表
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -121,7 +121,7 @@ class ChannelController extends Controller
                  * 某用户有编辑权限的
                  */
                 #获取user所有有权限的channel列表
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -142,7 +142,7 @@ class ChannelController extends Controller
                 break;
             case 'user-in-chapter':
                 #获取user 在某章节 所有有权限的channel列表
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -306,7 +306,7 @@ class ChannelController extends Controller
      */
     public function showMyNumber(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -417,7 +417,7 @@ class ChannelController extends Controller
         }
 
         #获取 user 在某章节 所有有权限的 channel 列表
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if ($user !== false) {
             //我自己的
             if ($request->input('owner') === 'all' || $request->input('owner') === 'my') {
@@ -543,7 +543,7 @@ class ChannelController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -627,7 +627,7 @@ class ChannelController extends Controller
     public function update(Request $request, Channel $channel)
     {
         //鉴权
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -659,7 +659,7 @@ class ChannelController extends Controller
     public function patch(Request $request, Channel $channel)
     {
         //鉴权
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), [], 401);
         }
@@ -703,7 +703,7 @@ class ChannelController extends Controller
     public function destroy(Request $request, Channel $channel)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }

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

@@ -15,7 +15,7 @@ use App\Http\Api\ChannelApi;
 use App\Http\Api\StudioApi;
 
 
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Resources\TocResource;
 use App\Services\PaliContentService;
 
@@ -87,7 +87,7 @@ class ChapterContentController extends Controller
     public function show(Request $request, string $id)
     {
         /**
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if ($user) {
             $this->userUuid = $user['user_uid'];
         }

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

@@ -6,7 +6,7 @@ use App\Models\Collection;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Log;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 use App\Http\Resources\CollectionResource;
 use App\Services\CollectionService;
@@ -63,7 +63,7 @@ class CollectionController extends Controller
     // studio 分支的鉴权逻辑留在 controller
     private function buildStudioIndex(Request $request): Builder
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             throw new \Illuminate\Auth\AuthenticationException(__('auth.failed'));
         }
@@ -93,7 +93,7 @@ class CollectionController extends Controller
 
     public function store(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -132,7 +132,7 @@ class CollectionController extends Controller
 
         if ($result->status < 30) {
             Log::info('私有文章，判断权限' . $id);
-            $user = AuthApi::current($request);
+            $user = AuthService::current($request);
             if (!$user) {
                 Log::warning('未登录');
                 return $this->error(__('auth.failed'), 403, 403);
@@ -158,7 +158,7 @@ class CollectionController extends Controller
             return $this->error('no recorder');
         }
 
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -185,7 +185,7 @@ class CollectionController extends Controller
 
     public function destroy(Request $request, string $id)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }

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

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\Mq;
 
 class CommandController extends Controller
@@ -28,7 +28,7 @@ class CommandController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user || $user['user_uid'] !== 'ba5463f3-72d1-4410-858e-eadd10884713') {
             return $this->error(__('auth.failed'), 403, 403);
         }

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

@@ -22,7 +22,7 @@ use App\Http\Api\SuggestionApi;
 use App\Http\Api\ChannelApi;
 use App\Http\Api\UserApi;
 use App\Http\Api\StudioApi;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Arr;
 use App\Http\Resources\TocResource;
@@ -183,7 +183,7 @@ class CorpusController extends Controller
      */
     public function showSent(Request  $request, string $id)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if ($user) {
             $this->userUuid = $user['user_uid'];
         }
@@ -208,7 +208,7 @@ class CorpusController extends Controller
      */
     public function showSentences(Request $request, string $type, string $id)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if ($user) {
             $this->userUuid = $user['user_uid'];
         }
@@ -275,7 +275,7 @@ class CorpusController extends Controller
         if ($request->has('debug')) {
             $this->debug = explode(',', $request->input('debug'));
         }
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if ($user) {
             $this->userUuid = $user['user_uid'];
         }
@@ -382,7 +382,7 @@ class CorpusController extends Controller
         if ($request->has('debug')) {
             $this->debug = explode(',', $request->input('debug'));
         }
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if ($user) {
             $this->userUuid = $user['user_uid'];
         }

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

@@ -5,7 +5,7 @@ namespace App\Http\Controllers;
 use App\Models\Course;
 use App\Models\CourseMember;
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 use App\Http\Resources\CourseResource;
 use Illuminate\Support\Facades\DB;
@@ -67,7 +67,7 @@ class CourseController extends Controller
                 break;
             case 'create':
                 # 获取 studio 建立的所有 course
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -79,7 +79,7 @@ class CourseController extends Controller
                 $table = Course::where('studio_id', $user["user_uid"]);
                 break;
             case 'study':
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -98,7 +98,7 @@ class CourseController extends Controller
                 break;
             case 'teach':
                 //我任教的课程
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -139,7 +139,7 @@ class CourseController extends Controller
      */
     public function showMyCourseNumber(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -166,7 +166,7 @@ class CourseController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -244,7 +244,7 @@ class CourseController extends Controller
     public function update(Request $request, Course $course)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -300,7 +300,7 @@ class CourseController extends Controller
     public function destroy(Request $request, Course $course)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }

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

@@ -8,7 +8,7 @@ use App\Models\UserInfo;
 
 use Illuminate\Http\Request;
 use App\Http\Resources\CourseMemberResource;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use Illuminate\Support\Facades\Log;
 use App\Http\Api\UserApi;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -24,7 +24,7 @@ class CourseMemberController extends Controller
     public function index(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed', [403], 403));
         }
@@ -110,7 +110,7 @@ class CourseMemberController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed', [403], 403));
         }
@@ -189,7 +189,7 @@ class CourseMemberController extends Controller
     public function show(Request $request, string $courseId)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -222,7 +222,7 @@ class CourseMemberController extends Controller
          * 增加一条新纪录
          * 原有记录变为历史记录
          */
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -253,7 +253,7 @@ class CourseMemberController extends Controller
     public function set_channel(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -286,7 +286,7 @@ class CourseMemberController extends Controller
     {
         //查看删除者有没有删除权限
         //查询删除者的权限
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -319,7 +319,7 @@ class CourseMemberController extends Controller
      */
     public function curr(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }

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

@@ -11,7 +11,7 @@ use App\Models\DhammaTerm;
 use App\Models\Channel;
 use App\Http\Resources\TermResource;
 
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 use App\Http\Api\ChannelApi;
 use App\Http\Api\ShareApi;
@@ -96,7 +96,7 @@ class DhammaTermController extends Controller
                 break;
             case 'studio':
                 # 获取 studio 内所有 term
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'), [], 401);
                 }
@@ -109,7 +109,7 @@ class DhammaTermController extends Controller
                 break;
             case 'channel':
                 # 获取 studio 内所有 term
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -130,7 +130,7 @@ class DhammaTermController extends Controller
                 break;
             case 'user':
                 # code...
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -209,7 +209,7 @@ class DhammaTermController extends Controller
      */
     public function store(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -324,7 +324,7 @@ class DhammaTermController extends Controller
     public function update(Request $request, string $id)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), [], 401);
         }
@@ -373,7 +373,7 @@ class DhammaTermController extends Controller
         /**
          * 一次删除多个单词
          */
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }

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

@@ -9,7 +9,7 @@ use App\Models\GroupMember;
 use Illuminate\Http\Request;
 use App\Tools\CaseMan;
 use App\Http\Api\DictApi;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 
 require_once __DIR__ . "/../../Tools/grm_abbr.php";
 
@@ -41,7 +41,7 @@ class DictController extends Controller
         /**
          * 临时代码判断是否在缅汉字典群里面。在群里的用户可以产看缅汉字典pdf
          */
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if ($user) {
             $inMyHanGroup = GroupMember::where('group_id', '905af467-1bde-4d2c-8dc7-49cfb74e0b09')
                 ->where('user_id', $user['user_uid'])->exists();

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

@@ -9,7 +9,7 @@ use App\Models\UserDict;
 use App\Models\WordIndex;
 use App\Http\Resources\DictPreferenceResource;
 use App\Http\Api\DictApi;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 
 class DictPreferenceController extends Controller
 {
@@ -91,7 +91,7 @@ class DictPreferenceController extends Controller
      */
     public function update(Request $request,  $id)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), [], 401);
         }

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

@@ -15,7 +15,7 @@ use App\Http\Controllers\ArticleController;
 use App\Http\Controllers\WbwSentenceController;
 use App\Http\Resources\DiscussionResource;
 use App\Http\Api\MdRender;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\Mq;
 use App\Http\Api\UserApi;
 use App\Http\Api\ChannelApi;
@@ -31,7 +31,7 @@ class DiscussionController extends Controller
     public function index(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if ($user) {
             $userInfo = UserApi::getByUuid($user['user_uid']);
         }
@@ -216,7 +216,7 @@ class DiscussionController extends Controller
 
         $can_create = false;
         $can_reply = false;
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
 
         switch ($request->input('type', 'discussion')) {
             case 'qa':
@@ -302,7 +302,7 @@ class DiscussionController extends Controller
      */
     public function store(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             Log::error('discussion store auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), [401], 401);
@@ -418,7 +418,7 @@ class DiscussionController extends Controller
     public function update(Request $request, Discussion $discussion)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), [403], 403);
         }
@@ -474,7 +474,7 @@ class DiscussionController extends Controller
     public function destroy(Request $request, Discussion $discussion)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), [401], 401);
         }

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

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\ChannelApi;
 use App\Http\Resources\DiscussionCountResource;
 use App\Http\Resources\TagMapResource;
@@ -63,7 +63,7 @@ class DiscussionCountController extends Controller
          * 3. 计算答案channel的结果
          * 4. 计算作业channel的结果
          */
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error('auth.failed', 401, 401);
         }

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

@@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Storage;
 
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\Mq;
 use Illuminate\Support\Facades\Cache;
 use App\Tools\ExportDownload;
@@ -23,7 +23,7 @@ class ExportController extends Controller
     public function index(Request $request)
     {
         $queryId = Str::uuid();
-        $token = AuthApi::getToken($request);
+        $token = AuthService::getToken($request);
         switch ($request->input('type', 'chapter')) {
             case 'chapter':
                 $data = [

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

@@ -8,7 +8,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\DB;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 use App\Http\Resources\GroupResource;
 
@@ -28,7 +28,7 @@ class GroupController extends Controller
         switch ($request->input('view')) {
             case 'studio':
                 # 获取studio内所有group
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -85,7 +85,7 @@ class GroupController extends Controller
      */
     public function showMyNumber(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -110,7 +110,7 @@ class GroupController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -162,7 +162,7 @@ class GroupController extends Controller
         }
         if ($result->status < 30) {
             //私有，判断权限
-            $user = AuthApi::current($request);
+            $user = AuthService::current($request);
             if (!$user) {
                 return $this->error(__('auth.failed'));
             }
@@ -191,7 +191,7 @@ class GroupController extends Controller
     public function update(Request $request, GroupInfo $group)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -219,7 +219,7 @@ class GroupController extends Controller
     public function destroy(Request $request, GroupInfo $group)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }

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

@@ -6,7 +6,7 @@ use App\Models\GroupMember;
 use App\Models\GroupInfo;
 use Illuminate\Http\Request;
 use App\Http\Resources\GroupMemberResource;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 
 class GroupMemberController extends Controller
 {
@@ -18,7 +18,7 @@ class GroupMemberController extends Controller
     public function index(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -135,7 +135,7 @@ class GroupMemberController extends Controller
         //
         //查看删除者有没有删除权限
         //查询删除者的权限
-        $currUser = AuthApi::current($request);
+        $currUser = AuthService::current($request);
         if (!$currUser) {
             return $this->error(__('auth.failed'));
         }

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

@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\Discussion;
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 
 class InteractiveController extends Controller
 {
@@ -38,7 +38,7 @@ class InteractiveController extends Controller
     public function show(Request $request, string $res_id)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         $data = [];
         switch ($request->input('res_type')) {
             case 'article':

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

@@ -5,7 +5,7 @@ namespace App\Http\Controllers;
 use App\Models\Invite;
 use App\Models\UserInfo;
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\UserApi;
 use App\Http\Api\StudioApi;
 use App\Http\Resources\InviteResource;
@@ -23,7 +23,7 @@ class InviteController extends Controller
     public function index(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -80,7 +80,7 @@ class InviteController extends Controller
         //
         $sender = '';
         if (!empty($request->input('studio'))) {
-            $user = AuthApi::current($request);
+            $user = AuthService::current($request);
             if (!$user) {
                 return $this->error(__('auth.failed'), 401, 401);
             }

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

@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\Like;
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\UserApi;
 use App\Http\Resources\LikeResource;
 use Illuminate\Support\Str;
@@ -27,7 +27,7 @@ class LikeController extends Controller
                     ->select("type")
                     ->selectRaw("count(*)")
                     ->get();
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if ($user) {
                     foreach ($result as $key => $value) {
                         $curr = Like::where([
@@ -70,7 +70,7 @@ class LikeController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -135,7 +135,7 @@ class LikeController extends Controller
     public function destroy(Request $request, Like $like)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }

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

@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\ModelLog;
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Resources\ModelLogResource;
 use Illuminate\Support\Str;
 
@@ -18,7 +18,7 @@ class ModelLogController extends Controller
     public function index(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }

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

@@ -7,7 +7,7 @@ use App\Models\Relation;
 use App\Models\DhammaTerm;
 use Illuminate\Http\Request;
 use App\Http\Resources\NissayaEndingResource;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\ChannelApi;
 use Illuminate\Support\Facades\App;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -87,7 +87,7 @@ class NissayaEndingController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -134,7 +134,7 @@ class NissayaEndingController extends Controller
     public function update(Request $request, NissayaEnding $nissayaEnding)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -178,7 +178,7 @@ class NissayaEndingController extends Controller
     public function destroy(Request $request, NissayaEnding $nissayaEnding)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -217,7 +217,7 @@ class NissayaEndingController extends Controller
 
     public function import(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }

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

@@ -6,7 +6,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Log;
 use App\Models\Notification;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Resources\NotificationResource;
 
 class NotificationController extends Controller
@@ -19,7 +19,7 @@ class NotificationController extends Controller
     public function index(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
@@ -62,7 +62,7 @@ class NotificationController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
@@ -120,7 +120,7 @@ class NotificationController extends Controller
     public function update(Request $request, Notification $notification)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }

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

@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\Project;
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 use App\Http\Api\ShareApi;
 
@@ -21,7 +21,7 @@ class ProjectController extends Controller
      */
     public function index(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
@@ -102,7 +102,7 @@ class ProjectController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -161,7 +161,7 @@ class ProjectController extends Controller
     public function update(Request $request, Project $project)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }

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

@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\Project;
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use Illuminate\Support\Str;
 use App\Http\Api\StudioApi;
 use Illuminate\Support\Facades\Log;
@@ -30,7 +30,7 @@ class ProjectTreeController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);

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

@@ -5,7 +5,7 @@ namespace App\Http\Controllers;
 use App\Models\Recent;
 use Illuminate\Http\Request;
 use App\Http\Resources\RecentResource;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use Illuminate\Support\Str;
 
 class RecentController extends Controller
@@ -46,7 +46,7 @@ class RecentController extends Controller
      */
     public function store(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), [], 401);
         }

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

@@ -5,7 +5,7 @@ namespace App\Http\Controllers;
 use App\Models\Relation;
 use Illuminate\Http\Request;
 use App\Http\Resources\RelationResource;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use Illuminate\Support\Facades\App;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
@@ -87,7 +87,7 @@ class RelationController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), [], 401);
         }
@@ -145,7 +145,7 @@ class RelationController extends Controller
     public function update(Request $request, Relation $relation)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -184,7 +184,7 @@ class RelationController extends Controller
     public function destroy(Request $request, Relation $relation)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -226,7 +226,7 @@ class RelationController extends Controller
 
     public function import(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }

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

@@ -15,7 +15,7 @@ use App\Models\Sentence;
 use App\Models\Notification;
 use App\Http\Resources\SentPrResource;
 use App\Http\Api\Mq;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 
 class SentPrController extends Controller
 {
@@ -41,7 +41,7 @@ class SentPrController extends Controller
         }
         if ($result) {
             //修改notification 已读状态
-            $user = AuthApi::current($request);
+            $user = AuthService::current($request);
             if ($user) {
                 $id = array();
                 foreach ($result as $key => $row) {
@@ -110,7 +110,7 @@ class SentPrController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -152,7 +152,7 @@ class SentPrController extends Controller
 
         $suggestionData =  [
             'data' => new SentPrResource($new),
-            'token' => AuthApi::getToken($request),
+            'token' => AuthService::getToken($request),
             'notification' => $request->input('notification', true),
             'webhook' => $request->input('webhook', true),
         ];
@@ -195,7 +195,7 @@ class SentPrController extends Controller
             return $this->error('no data', 404, 404);
         }
         //修改notification 已读状态
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if ($user) {
             Notification::where('res_id', $uid)
                 ->where('to', $user['user_uid'])
@@ -214,7 +214,7 @@ class SentPrController extends Controller
      */
     public function update(Request $request, string $id)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -241,7 +241,7 @@ class SentPrController extends Controller
     public function destroy(Request $request, string $id)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }

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

@@ -14,7 +14,7 @@ use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Redis;
 
 use App\Http\Resources\SentResource;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\ShareApi;
 use App\Http\Api\ChannelApi;
 use App\Http\Api\PaliTextApi;
@@ -34,7 +34,7 @@ class SentenceController extends Controller
      */
     public function index(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         $result = false;
         $indexCol = [
             'id',
@@ -113,7 +113,7 @@ class SentenceController extends Controller
                 $channelTable = Channel::where("type", $type)->select(['uid', 'name']);
                 $channelPub = $channelTable->where('status', 30)->get();
 
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 $channelShare = array();
                 $channelMy = array();
                 if ($user) {
@@ -295,7 +295,7 @@ class SentenceController extends Controller
     public function store(Request $request)
     {
         //鉴权
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             //未登录用户
             return $this->error(__('auth.failed'), 401, 401);
@@ -477,7 +477,7 @@ class SentenceController extends Controller
         $param = \explode('_', $id);
 
         //鉴权
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             //未登录鉴权失败
             return $this->error(__('auth.failed'), 403, 403);

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

@@ -6,7 +6,7 @@ use App\Models\Share;
 use App\Models\GroupInfo;
 use Illuminate\Http\Request;
 use App\Http\Resources\ShareResource;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\ShareApi;
 use Illuminate\Support\Str;
 
@@ -20,7 +20,7 @@ class ShareController extends Controller
     public function index(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         $result = false;
         $role = "member";
         $indexCol = ['id', 'res_id', 'res_type', 'power', 'updated_at', 'created_at'];
@@ -140,7 +140,7 @@ class ShareController extends Controller
     public function update(Request $request, Share $share)
     {
         //查询权限
-        $currUser = AuthApi::current($request);
+        $currUser = AuthService::current($request);
         if (!$currUser) {
             return $this->error(__('auth.failed'));
         }
@@ -174,7 +174,7 @@ class ShareController extends Controller
     public function destroy(Request $request, Share $share)
     {
         //查询权限
-        $currUser = AuthApi::current($request);
+        $currUser = AuthService::current($request);
         if (!$currUser) {
             return $this->error(__('auth.failed'));
         }

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

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 use App\Http\Api\ShareApi;
 use App\Models\Channel;

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

@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\AiModel;
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Cache;
 use App\Http\Resources\AiModelResource;
@@ -20,7 +20,7 @@ class SysModelController extends Controller
     public function index(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
@@ -48,7 +48,7 @@ class SysModelController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);

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

@@ -9,7 +9,7 @@ use App\Models\TagMap;
 use App\Models\ProgressChapter;
 use Illuminate\Http\Request;
 use App\Http\Resources\TagResource;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 
 class TagController extends Controller
@@ -60,7 +60,7 @@ class TagController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -107,7 +107,7 @@ class TagController extends Controller
     public function update(Request $request, Tag $tag)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }

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

@@ -7,7 +7,7 @@ use App\Models\Tag;
 use Illuminate\Http\Request;
 use App\Http\Resources\TagMapResource;
 use App\Http\Resources\TagResource;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 use App\Http\Api\CourseApi;
 use Illuminate\Support\Str;
@@ -86,7 +86,7 @@ class TagMapController extends Controller
      */
     public function store(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -161,7 +161,7 @@ class TagMapController extends Controller
      */
     public function destroy(Request $request, TagMap $tagMap)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }

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

@@ -11,7 +11,7 @@ use App\Models\TaskAssignee;
 use App\Models\Project;
 use App\Http\Resources\TaskResource;
 
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 use App\Http\Api\TaskApi;
 
@@ -26,7 +26,7 @@ class TaskController extends Controller
     public function index(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
@@ -145,7 +145,7 @@ class TaskController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -214,7 +214,7 @@ class TaskController extends Controller
     public function update(Request $request, Task $task)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
@@ -296,7 +296,7 @@ class TaskController extends Controller
     public function destroy(Request $request, Task  $task)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }

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

@@ -10,7 +10,7 @@ use App\Models\TaskAssignee;
 use Illuminate\Support\Facades\Log;
 
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 
 use Illuminate\Support\Str;
 
@@ -37,7 +37,7 @@ class TaskGroupController extends Controller
 
         //
 
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }

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

@@ -12,7 +12,7 @@ use App\Models\TaskRelation;
 use App\Models\TaskAssignee;
 use App\Models\AiModel;
 use App\Http\Resources\TaskResource;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\WatchApi;
 use App\Http\Api\UserApi;
 
@@ -85,7 +85,7 @@ class TaskStatusController extends Controller
     {
         //
         $task = Task::findOrFail($id);
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }

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

@@ -10,7 +10,7 @@ use Illuminate\Support\Str;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 use App\Http\Api\ChannelApi;
 use App\Http\Api\ShareApi;
@@ -25,7 +25,7 @@ class TermExportController extends Controller
      */
     public function index(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -107,7 +107,7 @@ class TermExportController extends Controller
 
     public function import(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }

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

@@ -6,7 +6,7 @@ use App\Models\Transfer;
 use App\Models\Channel;
 use App\Models\Article;
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 use App\Http\Api\UserApi;
 use App\Http\Resources\TransferResource;
@@ -25,7 +25,7 @@ class TransferController extends Controller
         switch ($request->input('view')) {
             case 'studio':
                 # 获取studio内所有channel
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -83,7 +83,7 @@ class TransferController extends Controller
      */
     public function store(Request $request)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
@@ -164,7 +164,7 @@ class TransferController extends Controller
      */
     public function update(Request $request, Transfer $transfer)
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), [403], 403);
         }

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

@@ -8,7 +8,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Facades\Log;
 use App\Http\Api;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\DictApi;
 use App\Http\Resources\UserDictResource;
 use Illuminate\Support\Str;
@@ -43,7 +43,7 @@ class UserDictController extends Controller
         switch ($request->input('view')) {
             case 'all':
                 # 获取studio内所有channel
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -51,7 +51,7 @@ class UserDictController extends Controller
                 break;
             case 'studio':
                 # 获取studio内所有channel
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -144,7 +144,7 @@ class UserDictController extends Controller
     public function store(Request $request)
     {
         //
-        $user  = AuthApi::current($request);
+        $user  = AuthService::current($request);
         if (!$user) {
             $this->error("not login");
         }
@@ -263,7 +263,7 @@ class UserDictController extends Controller
     public function destroy(Request $request, $id)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), [], 403);
         }

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

@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\UserOperationDaily;
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\UserApi;
 
 class UserOperationDailyController extends Controller
@@ -20,7 +20,7 @@ class UserOperationDailyController extends Controller
         switch ($request->input('view')) {
             case "user-all":
                 $queryUserUuid = UserApi::getIdByName($request->input('studio_name'));
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }

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

@@ -9,7 +9,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Log;
 use App\Http\Resources\ViewResource;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 
 class ViewController extends Controller
@@ -74,7 +74,7 @@ class ViewController extends Controller
                 return $this->ok($count);
                 break;
             case 'user-recent':
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -85,7 +85,7 @@ class ViewController extends Controller
                 return $this->ok($items);
                 break;
             case 'user':
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -94,7 +94,7 @@ class ViewController extends Controller
                 break;
             case 'studio':
                 # 获取studio内所有 数据
-                $user = AuthApi::current($request);
+                $user = AuthService::current($request);
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
@@ -154,7 +154,7 @@ class ViewController extends Controller
             'target_id' => $target_id,
             'target_type' => $request->input("target_type"),
         ];
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if ($user) {
             //已经登陆
             $user_id = $user['user_uid'];

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

@@ -11,7 +11,7 @@ use App\Models\Sentence;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use App\Tools\Tools;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\ShareApi;
 use App\Http\Api\ChannelApi;
 use App\Http\Api\Mq;
@@ -39,7 +39,7 @@ class WbwController extends Controller
     {
         //
         //鉴权
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             //未登录用户
             return $this->error(__('auth.failed'), [], 401);

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

@@ -11,7 +11,7 @@ use App\Tools\CaseMan;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Cache;
 use App\Http\Api\DictApi;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 
 
 
@@ -193,7 +193,7 @@ class WbwLookupController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             //未登录用户
             return $this->error(__('auth.failed'), 401, 401);

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

@@ -9,7 +9,7 @@ use App\Models\CourseMember;
 use App\Models\Course;
 
 use Illuminate\Http\Request;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\ShareApi;
 use App\Http\Api\ChannelApi;
 use App\Http\Api\CourseApi;
@@ -27,7 +27,7 @@ class WbwSentenceController extends Controller
         //
         $channelsId = [];
         $result = [];
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         $user_uid = null;
         if ($user) {
             $user_uid = $user['user_uid'];
@@ -177,7 +177,7 @@ class WbwSentenceController extends Controller
     {
         //
         //鉴权
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             //未登录用户
             return $this->error(__('auth.failed'), 401, 401);

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

@@ -5,7 +5,7 @@ namespace App\Http\Controllers;
 use App\Models\WebHook;
 use Illuminate\Http\Request;
 use App\Http\Resources\WebHookResource;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use Illuminate\Support\Str;
 
 class WebHookController extends Controller
@@ -46,7 +46,7 @@ class WebHookController extends Controller
     public function store(Request $request)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), [], 401);
         }
@@ -101,7 +101,7 @@ class WebHookController extends Controller
     public function update(Request $request, string $id)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'), [], 401);
         }
@@ -141,7 +141,7 @@ class WebHookController extends Controller
     public function destroy(Request $request, string $id)
     {
         //
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return $this->error(__('auth.failed'));
         }

api-v13/app/Http/Middleware/UserOperation.php

@@ -11,7 +11,7 @@ use Illuminate\Support\Facades\Log;
 use App\Models\UserOperationLog;
 use App\Models\UserOperationFrame;
 use App\Models\UserOperationDaily;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 
 class UserOperation
 {
@@ -26,7 +26,7 @@ class UserOperation
     {
         $response = $next($request);
 
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (! $user) {
             return $response;
         }

api-v13/app/Http/Requests/StoreDiscussionRequest.php

@@ -3,7 +3,7 @@
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use Illuminate\Support\Facades\Log;
 
 class StoreDiscussionRequest extends FormRequest
@@ -16,7 +16,7 @@ class StoreDiscussionRequest extends FormRequest
      */
     public function authorize()
     {
-        $user = AuthApi::current($this);
+        $user = AuthService::current($this);
         if (!$user) {
             Log::warning('discussion store auth failed', ['request' => $this]);
             return false;

api-v13/app/Http/Resources/ArticleResource.php

@@ -17,7 +17,7 @@ use App\Http\Controllers\ArticleController;
 use App\Http\Api\MdRender;
 use App\Http\Api\UserApi;
 use App\Http\Api\StudioApi;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\ChannelApi;
 
 
@@ -45,7 +45,7 @@ class ArticleResource extends JsonResource
             "updated_at" => $this->updated_at,
         ];
 
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if ($user) {
             $canEdit = ArticleController::userCanEdit($user['user_uid'], $this);
             if ($canEdit) {

api-v13/app/Http/Resources/CourseResource.php

@@ -8,7 +8,7 @@ use App\Http\Api\StudioApi;
 use App\Models\Collection;
 use App\Models\Channel;
 use App\Models\CourseMember;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Models\Attachment;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
@@ -55,7 +55,7 @@ class CourseResource extends JsonResource
             ->where('is_current', true)
             ->select(['role', 'status'])
             ->get();
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if ($user) {
             $data['my_role'] = CourseMember::where('course_id', $this->id)
                 ->where('is_current', true)
@@ -101,7 +101,7 @@ class CourseResource extends JsonResource
         }
 
         if ($request->input('view') === "study" || $request->input('view') === "teach") {
-            $user = AuthApi::current($request);
+            $user = AuthService::current($request);
             if ($user) {
                 $course_member = CourseMember::where('user_id', $user["user_uid"])
                     ->where('course_id', $this->id)

api-v13/app/Http/Resources/GroupResource.php

@@ -4,7 +4,7 @@ namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 use App\Models\GroupMember;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 
 class GroupResource extends JsonResource
@@ -17,7 +17,7 @@ class GroupResource extends JsonResource
      */
     public function toArray($request)
     {
-		$data = [
+        $data = [
             'uid' => $this->uid,
             'name' => $this->name,
             'description' => $this->description,
@@ -26,14 +26,14 @@ class GroupResource extends JsonResource
             'updated_at' => $this->updated_at,
             'created_at' => $this->created_at
         ];
-        $user = AuthApi::current($request);
-        if($user){
-            if($this->owner === $user['user_uid']){
+        $user = AuthService::current($request);
+        if ($user) {
+            if ($this->owner === $user['user_uid']) {
                 $data['role'] = 'owner';
-            }else{
-                $power = GroupMember::where('user_id',$user['user_uid'])
-                                      ->where('group_id',$this->uid)
-                                      ->value('power');
+            } else {
+                $power = GroupMember::where('user_id', $user['user_uid'])
+                    ->where('group_id', $this->uid)
+                    ->value('power');
                 switch ($power) {
                     case 0:
                         $data['role'] = 'owner';

api-v13/app/Http/Resources/SentPrResource.php

@@ -5,7 +5,7 @@ namespace App\Http\Resources;
 use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Api\MdRender;
 use App\Http\Api\UserApi;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\ChannelApi;
 
 class SentPrResource extends JsonResource
@@ -19,7 +19,7 @@ class SentPrResource extends JsonResource
     public function toArray($request)
     {
         //获取用户信息
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         $role = 'reader';
         if ($user && $user["user_uid"] === $this->editor_uid) {
             $role = 'owner';

api-v13/app/Http/Resources/SentSimResource.php

@@ -8,7 +8,7 @@ use App\Models\PaliText;
 use App\Http\Api\UserApi;
 use App\Http\Api\ChannelApi;
 use App\Http\Controllers\CorpusController;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 
 class SentSimResource extends JsonResource
 {

api-v13/app/Http/Resources/TermResource.php

@@ -10,7 +10,7 @@ use App\Http\Api\StudioApi;
 use App\Http\Api\UserApi;
 use App\Http\Api\MdRender;
 use App\Http\Api\ShareApi;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Models\UserOperationDaily;
 use App\Models\DhammaTerm;
 use App\Helpers\MarkdownHelper;
@@ -108,7 +108,7 @@ class TermResource extends JsonResource
             $data["summary"]  = $mdRender->convert($summaryContent, $channels, null);
         }
 
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             $data["role"] = 'reader';
         } else {

api-v13/app/Services/AIAssistant/AITermService.php

@@ -8,8 +8,9 @@ use App\Services\OpenSearchService;
 use App\Services\TermService;
 use App\Services\OpenAIService;
 use App\Services\AIModelService;
+use App\Services\AuthService;
+
 use App\Http\Resources\AiModelResource;
-use App\Http\Controllers\AuthController;
 use App\DTO\Search\SearchDataDTO;
 
 class AITermService
@@ -205,7 +206,7 @@ class AITermService
     public function setModel($id)
     {
         $this->model = $this->modelService->getModelById($id);
-        $this->modelToken = AuthController::getUserToken($id);
+        $this->modelToken = AuthService::getUserToken($id);
         return $this;
     }
 

api-v13/app/Services/AIAssistant/ArticleTranslateService.php

@@ -11,7 +11,7 @@ use App\Models\CustomBook;
 
 use Illuminate\Support\Facades\Log;
 use App\Http\Api\ChannelApi;
-use Carbon\Callback;
+
 
 class ArticleTranslateService
 {

api-v13/app/Services/AIAssistant/TranslateService.php

@@ -6,7 +6,7 @@ use App\Services\NissayaParser;
 use App\Services\OpenAIService;
 use App\Services\RomanizeService;
 use App\Services\AIModelService;
-use App\Http\Controllers\AuthController;
+use App\Services\AuthService;
 
 use Illuminate\Support\Facades\Log;
 use App\Http\Resources\AiModelResource;
@@ -48,7 +48,7 @@ class TranslateService
     public function setModel(string $model): self
     {
         $this->model = $this->aiModelService->getModelById($model);
-        $this->modelToken = AuthController::getUserToken($model);
+        $this->modelToken = AuthService::getUserToken($model);
         return $this;
     }
     /**
@@ -112,7 +112,7 @@ class TranslateService
                 throw new \Exception('LLM返回内容为空');
             }
             Log::info('翻译完成', [
-                'content'=>$content,
+                'content' => $content,
                 'duration' => $complete,
                 'input_tokens' => $response['usage']['prompt_tokens'] ?? 0,
                 'output_tokens' => $response['usage']['completion_tokens'] ?? 0,

api-v13/app/Services/AiTranslateService.php

@@ -15,7 +15,7 @@ use App\Models\Sentence;
 
 use App\Http\Api\ChannelApi;
 
-use App\Http\Controllers\AuthController;
+use App\Services\AuthService;
 
 use App\Http\Api\MdRender;
 use App\Exceptions\SectionTimeoutException;
@@ -379,14 +379,16 @@ class AiTranslateService
     /**
      * 写入句子库
      */
-    private function saveSentence($sentence)
+    private function saveSentence(array $sentence, ?string $token = null)
     {
         $url = config('app.url') . '/api/v2/sentence';
 
         Log::info($this->queue . " sentence update {$url}");
-        $response = Http::timeout($this->apiTimeout)->withToken($this->modelToken)->post($url, [
-            'sentences' => [$sentence],
-        ]);
+        $response = Http::timeout($this->apiTimeout)
+            ->withToken($token ?? $this->modelToken)
+            ->post($url, [
+                'sentences' => [$sentence],
+            ]);
         if ($response->failed()) {
             Log::error($this->queue . ' sentence update failed', [
                 'url' => $url,
@@ -592,7 +594,7 @@ class AiTranslateService
 
         # ai model
         $aiModel = AiModel::findOrFail($aiAssistantId);
-        $modelToken = AuthController::getUserToken($aiModel->uid);
+        $modelToken = AuthService::getUserToken($aiModel->uid);
         $aiModel['token'] = $modelToken;
         $sumLen = 0;
         $mqData = [];

api-v13/app/Services/AuthService.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Services;
+
+use App\Http\Api\UserApi;
+use App\Http\Api\AiAssistantApi;
+
+use Illuminate\Http\Request;
+use Firebase\JWT\JWT;
+use Firebase\JWT\Key;
+
+class AuthService
+{
+    public static function getUserToken(string $userUid)
+    {
+        $user = UserApi::getByUuid($userUid);
+        if (!$user) {
+            $user = AiAssistantApi::getByUuid($userUid);
+        }
+        if ($user) {
+            $ExpTime = time() + 60 * 60 * 24 * 365;
+            $key = self::getJwtKey();
+            $payload = [
+                'nbf' => time(),
+                'exp' => $ExpTime,
+                'uid' => $user['id'],
+                'id' => $user['sn'],
+            ];
+            $jwt = JWT::encode($payload, $key, 'HS512');
+            return $jwt;
+        }
+        return null;
+    }
+    public static function getJwtKey()
+    {
+        return config('mint.app.jwt_secrets_key');
+    }
+    public static function getToken(Request $request)
+    {
+        $token = $request->bearerToken();
+        return $token;
+    }
+    public static function current(Request $request)
+    {
+        $token = $request->bearerToken();
+        if ($token) {
+            try {
+
+                $jwt = JWT::decode($token, new Key(self::getJwtKey(), 'HS512'));
+            } catch (\Exception $e) {
+                return false;
+            }
+            if ($jwt->exp < time()) {
+                //过期
+                return false;
+            } else {
+                //有效的token
+                return ['user_uid' => $jwt->uid, 'user_id' => $jwt->id];
+            }
+        } else if (isset($_COOKIE['user_uid'])) {
+            return [
+                'user_uid' => $_COOKIE['user_uid'],
+                'user_id' => $_COOKIE['user_id']
+            ];
+        } else {
+            return false;
+        }
+    }
+}

api-v13/app/Services/CollectionService.php

@@ -3,7 +3,7 @@
 namespace App\Services;
 
 use App\Models\Collection;
-use App\Http\Api\AuthApi;
+use App\Services\AuthService;
 use App\Http\Api\StudioApi;
 use App\Http\Api\ShareApi;
 use Illuminate\Http\Request;
@@ -55,7 +55,7 @@ class CollectionService
      */
     public function getMyNumber(Request $request): array
     {
-        $user = AuthApi::current($request);
+        $user = AuthService::current($request);
         if (!$user) {
             return ['error' => __('auth.failed'), 'code' => 403];
         }

api-v13/app/Services/SentenceService.php

@@ -5,12 +5,17 @@ namespace App\Services;
 use App\Models\Sentence;
 use App\Models\SentHistory;
 use App\Models\Channel;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Http\Client\RequestException;
 
 use Illuminate\Support\Str;
 
 class SentenceService
 {
-    public function save($data)
+    protected $timeOut = 30;
+
+    public function save(array $data)
     {
         $row = Sentence::firstOrNew([
             "book_id" => $data['book_id'],
@@ -47,4 +52,37 @@ class SentenceService
         $row->modify_time = time() * 1000;
         $row->save();
     }
+
+    /**
+     *                'sentence' => [
+                    'book_id' => $sentence['id'][0],
+                    'paragraph' => $sentence['id'][1],
+                    'word_start' => $sentence['id'][2],
+                    'word_end' => $sentence['id'][3],
+                    'channel_uid' => $channelId,
+                    'content' => $prompt,
+                    'content_type' => 'markdown',
+                    'access_token' => $sentChannelInfo[1] ?? $params['token'],
+                ],
+     */
+    public function saveRpc(array $sentence, string $editorToken)
+    {
+        $url = config('app.url') . '/api/v2/sentence';
+
+        Log::info(" sentence update {$url}");
+        $response = Http::timeout($this->timeOut)
+            ->withToken($editorToken)
+            ->post($url, [
+                'sentences' => [$sentence],
+            ]);
+        if ($response->failed()) {
+            Log::error(' sentence update failed', [
+                'url' => $url,
+                'data' => $response->json(),
+            ]);
+            throw new DatabaseException("sentence 数据库写入错误");
+        }
+        $count = $response->json()['data']['count'];
+        return $count;
+    }
 }