$request->get => input

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

@@ -38,7 +38,7 @@ class AccessTokenController extends Controller
             Log::error('未登录');
             return $this->error(__('auth.failed'), [], 401);
         }
-        $payload = $request->get('payload');
+        $payload = $request->input('payload');
         $result = array();
         foreach ($payload as $key => $value) {
             //鉴权

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

@@ -34,17 +34,17 @@ class AiAssistantController extends Controller
             ->orWhere('privacy', 'public')
             ->orWhereIn('uid', $resId);
         if ($request->has('keyword')) {
-            $table = $table->where('name', 'like', '%' . $request->get('keyword') . '%');
+            $table = $table->where('name', 'like', '%' . $request->input('keyword') . '%');
         }
         $count = $table->count();
 
         $table = $table->orderBy(
-            $request->get('order', 'created_at'),
-            $request->get('dir', 'asc')
+            $request->input('order', 'created_at'),
+            $request->input('dir', 'asc')
         );
 
-        $table = $table->skip($request->get("offset", 0))
-            ->take($request->get('limit', 1000));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 1000));
 
         $result = $table->get();
 

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

@@ -28,16 +28,16 @@ class AiModelController extends Controller
             Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
         }
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'all':
                 $table = AiModel::whereNotNull('owner_id');
                 break;
             case 'studio':
-                $studioId = StudioApi::getIdByName($request->get('name'));
+                $studioId = StudioApi::getIdByName($request->input('name'));
                 $table = AiModel::where('owner_id', $studioId);
                 break;
             case 'usable':
-                $table = AiModel::where('owner_id', $request->get('user_id'))
+                $table = AiModel::where('owner_id', $request->input('user_id'))
                     ->orWhere('privacy', 'public');
                 break;
             case 'chat':
@@ -45,17 +45,17 @@ class AiModelController extends Controller
                 break;
         }
         if ($request->has('keyword')) {
-            $table = $table->where('name', 'like', '%' . $request->get('keyword') . '%');
+            $table = $table->where('name', 'like', '%' . $request->input('keyword') . '%');
         }
         $count = $table->count();
 
         $table = $table->orderBy(
-            $request->get('order', 'created_at'),
-            $request->get('dir', 'asc')
+            $request->input('order', 'created_at'),
+            $request->input('dir', 'asc')
         );
 
-        $table = $table->skip($request->get("offset", 0))
-            ->take($request->get('limit', 1000));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 1000));
 
         $result = $table->get();
 
@@ -80,13 +80,13 @@ class AiModelController extends Controller
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
-        $studioId = StudioApi::getIdByName($request->get('studio_name'));
+        $studioId = StudioApi::getIdByName($request->input('studio_name'));
         Log::debug('store', ['studioId' => $studioId, 'user' => $user]);
         if (!self::canEdit($user['user_uid'], $studioId)) {
             return $this->error(__('auth.failed'), 403, 403);
         }
         $new = new AiModel();
-        $new->name = $request->get('name');
+        $new->name = $request->input('name');
         $new->uid = Str::uuid();
         $new->real_name = Str::uuid();
         $new->owner_id = $studioId;
@@ -124,13 +124,13 @@ class AiModelController extends Controller
         if (!self::canEdit($user['user_uid'], $aiModel->owner_id)) {
             return $this->error(__('auth.failed'), 403, 403);
         }
-        $aiModel->name = $request->get('name');
-        $aiModel->description = $request->get('description');
-        $aiModel->system_prompt = $request->get('system_prompt');
-        $aiModel->url = $request->get('url');
-        $aiModel->model = $request->get('model');
-        $aiModel->key = $request->get('key');
-        $aiModel->privacy = $request->get('privacy');
+        $aiModel->name = $request->input('name');
+        $aiModel->description = $request->input('description');
+        $aiModel->system_prompt = $request->input('system_prompt');
+        $aiModel->url = $request->input('url');
+        $aiModel->model = $request->input('model');
+        $aiModel->key = $request->input('key');
+        $aiModel->privacy = $request->input('privacy');
         $aiModel->editor_id = $user['user_uid'];
         $aiModel->save();
         return $this->ok(new AiModelResource($aiModel));

api-v12/app/Http/Controllers/AiTranslateController.php

@@ -25,7 +25,7 @@ class AiTranslateController extends Controller
     public function store(Request $request)
     {
         //
-        return $this->fetch(strip_tags($request->get('origin')));
+        return $this->fetch(strip_tags($request->input('origin')));
     }
 
     private function fetch($origin, $engin = 'kimi', $prompt_pre = '', $prompt_suf = '请翻译上述巴利文。')
@@ -73,7 +73,7 @@ class AiTranslateController extends Controller
                 ->where('paragraph', $para[1])
                 ->value('text');
             if (!empty($content)) {
-                return $this->fetch($content, $request->get('engin', config('mint.ai.default')));
+                return $this->fetch($content, $request->input('engin', config('mint.ai.default')));
             } else {
                 return $this->error('no content', 200, 200);
             }

api-v12/app/Http/Controllers/ApiController.php

@@ -45,12 +45,12 @@ class ApiController extends Controller
         $begin = $currTime - $times - 1;
         $value = 0;
         for ($i = $begin; $i <= $currTime; $i++) {
-            $keyApi = $key . $request->get('api', 'all') . "/" . $i;
+            $keyApi = $key . $request->input('api', 'all') . "/" . $i;
             if (!empty(Redis::get($keyApi . '/delay'))) {
-                if ($request->get('item') === 'average') {
+                if ($request->input('item') === 'average') {
                     $value += intval(Redis::get($keyApi . '/delay') / Redis::get($keyApi . '/count'));
                 } else {
-                    $value += (int)Redis::get($keyApi . '/' . $request->get('item'));
+                    $value += (int)Redis::get($keyApi . '/' . $request->input('item'));
                 }
             }
         }
@@ -74,12 +74,12 @@ class ApiController extends Controller
         $output = [];
         for ($i = $begin; $i <= $currMinute; $i++) {
             $value = 0;
-            $keyApi = $key . $request->get('api', 'all') . "/" . $i;
+            $keyApi = $key . $request->input('api', 'all') . "/" . $i;
             if (!empty(Redis::get($keyApi . '/delay'))) {
-                if ($request->get('item') === 'average') {
+                if ($request->input('item') === 'average') {
                     $value += intval(Redis::get($keyApi . '/delay') / Redis::get($keyApi . '/count'));
                 } else {
-                    $value += (int)Redis::get($keyApi . '/' . $request->get('item'));
+                    $value += (int)Redis::get($keyApi . '/' . $request->input('item'));
                 }
             } else {
                 $value = 0;

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

@@ -24,108 +24,112 @@ use App\Tools\OpsLog;
 
 class ArticleController extends Controller
 {
-    public static function userCanRead($user_uid,Article $article){
-        if($article->status === 30 ){
+    public static function userCanRead($user_uid, Article $article)
+    {
+        if ($article->status === 30) {
             return true;
         }
-        if(empty($user_uid)){
+        if (empty($user_uid)) {
             return false;
         }
-            //私有文章，判断是否为所有者
-        if($user_uid === $article->owner){
+        //私有文章，判断是否为所有者
+        if ($user_uid === $article->owner) {
             return true;
         }
         //非所有者
         //判断是否为文章协作者
-        $power = ShareApi::getResPower($user_uid,$article->uid);
-        if($power >= 10 ){
+        $power = ShareApi::getResPower($user_uid, $article->uid);
+        if ($power >= 10) {
             return true;
         }
         //无读取权限
         //判断文集是否有读取权限
-        $inCollection = ArticleCollection::where('article_id',$article->uid)
-                                        ->select('collect_id')
-                                        ->groupBy('collect_id')->get();
-        if(!$inCollection){
+        $inCollection = ArticleCollection::where('article_id', $article->uid)
+            ->select('collect_id')
+            ->groupBy('collect_id')->get();
+        if (!$inCollection) {
             return false;
         }
         //查找与文章同主人的文集
-        $collections = Collection::whereIn('uid',$inCollection)
-                                    ->where('owner',$article->owner)
-                                    ->select('uid')
-                                    ->get();
-        if(!$collections){
+        $collections = Collection::whereIn('uid', $inCollection)
+            ->where('owner', $article->owner)
+            ->select('uid')
+            ->get();
+        if (!$collections) {
             return false;
         }
         //查找与文章同主人的文集是否是共享的
         $power = 0;
         foreach ($collections as $collection) {
             # code...
-            $currPower = ShareApi::getResPower($user_uid,$collection->uid);
-            if($currPower >= 10){
+            $currPower = ShareApi::getResPower($user_uid, $collection->uid);
+            if ($currPower >= 10) {
                 return true;
             }
         }
         return false;
     }
-    public static function userCanEditId($user_uid,$articleId){
+    public static function userCanEditId($user_uid, $articleId)
+    {
         $article = Article::find($articleId);
-        if($article){
-            return ArticleController::userCanEdit($user_uid,$article);
-        }else{
+        if ($article) {
+            return ArticleController::userCanEdit($user_uid, $article);
+        } else {
             return false;
         }
     }
-    public static function userCanEdit($user_uid,$article){
-        if(empty($user_uid)){
+    public static function userCanEdit($user_uid, $article)
+    {
+        if (empty($user_uid)) {
             return false;
         }
         //私有文章，判断是否为所有者
-        if($user_uid === $article->owner){
+        if ($user_uid === $article->owner) {
             return true;
         }
         //非所有者
         //判断是否为文章协作者
-        $power = ShareApi::getResPower($user_uid,$article->uid);
-        if($power >= 20 ){
+        $power = ShareApi::getResPower($user_uid, $article->uid);
+        if ($power >= 20) {
             return true;
         }
         //无读取权限
         //判断文集是否有读取权限
-        $inCollection = ArticleCollection::where('article_id',$article->uid)
-                                        ->select('collect_id')
-                                        ->groupBy('collect_id')->get();
-        if(!$inCollection){
+        $inCollection = ArticleCollection::where('article_id', $article->uid)
+            ->select('collect_id')
+            ->groupBy('collect_id')->get();
+        if (!$inCollection) {
             return false;
         }
         //查找与文章同主人的文集
-        $collections = Collection::whereIn('uid',$inCollection)
-                                    ->where('owner',$article->owner)
-                                    ->select('uid')
-                                    ->get();
-        if(!$collections){
+        $collections = Collection::whereIn('uid', $inCollection)
+            ->where('owner', $article->owner)
+            ->select('uid')
+            ->get();
+        if (!$collections) {
             return false;
         }
         //查找与文章同主人的文集是否是共享的
         $power = 0;
         foreach ($collections as $collection) {
             # code...
-            $currPower = ShareApi::getResPower($user_uid,$collection->uid);
-            if($currPower >= 20){
+            $currPower = ShareApi::getResPower($user_uid, $collection->uid);
+            if ($currPower >= 20) {
                 return true;
             }
         }
         return false;
     }
 
-    public static function userCanManage($user_uid,$studioName){
-        if(empty($user_uid)){
+    public static function userCanManage($user_uid, $studioName)
+    {
+        if (empty($user_uid)) {
             return false;
         }
         //判断是否为所有者
-        if($user_uid === StudioApi::getIdByName($studioName)){
+        if ($user_uid === StudioApi::getIdByName($studioName)) {
             return true;
-        }else{
+        } else {
             return false;
         }
     }
@@ -137,118 +141,130 @@ class ArticleController extends Controller
     public function index(Request $request)
     {
         //
-        $field = ['uid','title','subtitle',
-                                'summary','owner','lang',
-                                'status','editor_id','updated_at','created_at'];
-        if($request->get('content')==="true"){
+        $field = [
+            'uid',
+            'title',
+            'subtitle',
+            'summary',
+            'owner',
+            'lang',
+            'status',
+            'editor_id',
+            'updated_at',
+            'created_at'
+        ];
+        if ($request->input('content') === "true") {
             $field[] = 'content';
             $field[] = 'content_type';
         }
         $table = Article::select($field);
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'template':
-                $studioId = StudioApi::getIdByName($request->get('studio_name'));
+                $studioId = StudioApi::getIdByName($request->input('studio_name'));
                 $table = $table->where('owner', $studioId);
                 break;
             case 'studio':
-				# 获取studio内所有 article
+                # 获取studio内所有 article
                 $user = AuthApi::current($request);
-                if(!$user){
-                    return $this->error(__('auth.failed'),[],401);
+                if (!$user) {
+                    return $this->error(__('auth.failed'), [], 401);
                 }
                 //判断当前用户是否有指定的studio的权限
-                $studioId = StudioApi::getIdByName($request->get('name'));
-                if($user['user_uid'] !== $studioId){
-                    return $this->error(__('auth.failed'),[],403);
+                $studioId = StudioApi::getIdByName($request->input('name'));
+                if ($user['user_uid'] !== $studioId) {
+                    return $this->error(__('auth.failed'), [], 403);
                 }
 
-                if($request->get('view2','my')==='my'){
+                if ($request->input('view2', 'my') === 'my') {
                     $table = $table->where('owner', $studioId);
-                }else{
+                } else {
                     //协作
-                    $resList = ShareApi::getResList($studioId,3);
-                    $resId=[];
+                    $resList = ShareApi::getResList($studioId, 3);
+                    $resId = [];
                     foreach ($resList as $res) {
                         $resId[] = $res['res_id'];
                     }
-                    $table = $table->whereIn('uid', $resId)->where('owner','<>', $studioId);
+                    $table = $table->whereIn('uid', $resId)->where('owner', '<>', $studioId);
                 }
 
                 //根据anthology过滤
-                if($request->has('anthology')){
-                    switch ($request->get('anthology')) {
+                if ($request->has('anthology')) {
+                    switch ($request->input('anthology')) {
                         case 'all':
                             break;
                         case 'none':
                             # 我的文集
-                            $myCollection = Collection::where('owner',$studioId)->select('uid')->get();
+                            $myCollection = Collection::where('owner', $studioId)->select('uid')->get();
                             //收录在我的文集里面的文章
-                            $articles = ArticleCollection::whereIn('collect_id',$myCollection)
-                                                         ->select('article_id')->groupBy('article_id')->get();
+                            $articles = ArticleCollection::whereIn('collect_id', $myCollection)
+                                ->select('article_id')->groupBy('article_id')->get();
                             //不在这些范围之内的文章
-                            $table =  $table->whereNotIn('uid',$articles);
+                            $table =  $table->whereNotIn('uid', $articles);
                             break;
                         default:
-                            $articles = ArticleCollection::where('collect_id',$request->get('anthology'))
-                                                         ->select('article_id')->get();
-                            $table =  $table->whereIn('uid',$articles);
+                            $articles = ArticleCollection::where('collect_id', $request->input('anthology'))
+                                ->select('article_id')->get();
+                            $table =  $table->whereIn('uid', $articles);
                             break;
                     }
                 }
-				break;
+                break;
             case 'public':
-                $table = $table->where('status',30);
+                $table = $table->where('status', 30);
                 break;
             default:
                 $this->error("view error");
                 break;
         }
         //处理搜索
-        if($request->has("search") && !empty($request->get("search"))){
-            $table = $table->where('title', 'like', "%".$request->get("search")."%");
+        if ($request->has("search") && !empty($request->input("search"))) {
+            $table = $table->where('title', 'like', "%" . $request->input("search") . "%");
         }
-        if($request->has("subtitle") && !empty($request->get("subtitle"))){
-            $table = $table->where('subtitle', 'like', $request->get("subtitle"));
+        if ($request->has("subtitle") && !empty($request->input("subtitle"))) {
+            $table = $table->where('subtitle', 'like', $request->input("subtitle"));
         }
         //获取记录总条数
         $count = $table->count();
         //处理排序
-        $table = $table->orderBy($request->get("order",'updated_at'),
-                                 $request->get("dir",'desc'));
+        $table = $table->orderBy(
+            $request->input("order", 'updated_at'),
+            $request->input("dir", 'desc')
+        );
         //处理分页
-        $table = $table->skip($request->get("offset",0))
-                       ->take($request->get("limit",1000));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input("limit", 1000));
         //获取数据
         $result = $table->get();
-		return $this->ok(["rows"=>ArticleResource::collection($result),"count"=>$count]);
+        return $this->ok(["rows" => ArticleResource::collection($result), "count" => $count]);
     }
 
-        /**
+    /**
      * Display a listing of the resource.
      *
      * @return \Illuminate\Http\Response
      */
-    public function showMyNumber(Request $request){
+    public function showMyNumber(Request $request)
+    {
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
         //判断当前用户是否有指定的studio的权限
-        $studioId = StudioApi::getIdByName($request->get('studio'));
-        if($user['user_uid'] !== $studioId){
+        $studioId = StudioApi::getIdByName($request->input('studio'));
+        if ($user['user_uid'] !== $studioId) {
             return $this->error(__('auth.failed'));
         }
         //我的
         $my = Article::where('owner', $studioId)->count();
         //协作
-        $resList = ShareApi::getResList($studioId,3);
-        $resId=[];
+        $resList = ShareApi::getResList($studioId, 3);
+        $resId = [];
         foreach ($resList as $res) {
             $resId[] = $res['res_id'];
         }
-        $collaboration = Article::whereIn('uid', $resId)->where('owner','<>', $studioId)->count();
+        $collaboration = Article::whereIn('uid', $resId)->where('owner', '<>', $studioId)->count();
 
-        return $this->ok(['my'=>$my,'collaboration'=>$collaboration]);
+        return $this->ok(['my' => $my, 'collaboration' => $collaboration]);
     }
 
     /**
@@ -261,114 +277,114 @@ class ArticleController extends Controller
     {
         //判断权限
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             Log::error('未登录');
-            return $this->error(__('auth.failed'),[],401);
-        }else{
-            $user_uid=$user['user_uid'];
+            return $this->error(__('auth.failed'), [], 401);
+        } else {
+            $user_uid = $user['user_uid'];
         }
 
-        $canManage = ArticleController::userCanManage($user_uid,$request->get('studio'));
-        if(!$canManage){
+        $canManage = ArticleController::userCanManage($user_uid, $request->input('studio'));
+        if (!$canManage) {
             Log::error('userCanManage 失败');
             //判断是否有文集权限
-            if($request->has('anthologyId')){
-                $currPower = ShareApi::getResPower($user_uid,$request->get('anthologyId'));
-                if($currPower <= 10){
+            if ($request->has('anthologyId')) {
+                $currPower = ShareApi::getResPower($user_uid, $request->input('anthologyId'));
+                if ($currPower <= 10) {
                     Log::error('没有文集编辑权限');
-                    return $this->error(__('auth.failed'),[],403);
+                    return $this->error(__('auth.failed'), [], 403);
                 }
-            }else{
+            } else {
                 Log::error('没有文集id');
-                return $this->error(__('auth.failed'),[],403);
+                return $this->error(__('auth.failed'), [], 403);
             }
         }
         //权限判断结束
 
         //查询标题是否重复
         /*
-        if(Article::where('title',$request->get('title'))->where('owner',$studioUuid)->exists()){
+        if(Article::where('title',$request->input('title'))->where('owner',$studioUuid)->exists()){
             return $this->error(__('validation.exists'));
         }*/
-        Log::debug('开始新建'.$request->get('title'));
+        Log::debug('开始新建' . $request->input('title'));
 
         $newArticle = new Article;
-        DB::transaction(function() use($user,$request,$newArticle){
-            $studioUuid = StudioApi::getIdByName($request->get('studio'));
+        DB::transaction(function () use ($user, $request, $newArticle) {
+            $studioUuid = StudioApi::getIdByName($request->input('studio'));
             //新建文章，加入文集必须都成功。否则回滚
             $newArticle->id = app('snowflake')->id();
             $newArticle->uid = Str::uuid();
-            $newArticle->title = mb_substr($request->get('title'),0,128,'UTF-8');
-            $newArticle->lang = $request->get('lang');
-            if(!empty($request->get('status'))){
-                $newArticle->status = $request->get('status');
+            $newArticle->title = mb_substr($request->input('title'), 0, 128, 'UTF-8');
+            $newArticle->lang = $request->input('lang');
+            if (!empty($request->input('status'))) {
+                $newArticle->status = $request->input('status');
             }
             $newArticle->owner = $studioUuid;
             $newArticle->owner_id = $user['user_id'];
             $newArticle->editor_id = $user['user_id'];
-            $newArticle->parent = $request->get('parentId');
-            $newArticle->create_time = time()*1000;
-            $newArticle->modify_time = time()*1000;
+            $newArticle->parent = $request->input('parentId');
+            $newArticle->create_time = time() * 1000;
+            $newArticle->modify_time = time() * 1000;
             $newArticle->save();
-            OpsLog::debug($user['user_uid'],$newArticle);
-
-            Log::debug('开始挂接 id='.$newArticle->uid);
-            $anthologyId = $request->get('anthologyId');
-            if(Str::isUuid($anthologyId)){
-                $parentNode = $request->get('parentNode');
-                if(Str::isUuid($parentNode)){
-                    Log::debug('有挂接点'.$parentNode);
-                    $map = ArticleCollection::where('collect_id',$anthologyId)
-                                        ->orderBy('id')->get();
-                    Log::debug('查询到原map数据'.count($map));
+            OpsLog::debug($user['user_uid'], $newArticle);
+
+            Log::debug('开始挂接 id=' . $newArticle->uid);
+            $anthologyId = $request->input('anthologyId');
+            if (Str::isUuid($anthologyId)) {
+                $parentNode = $request->input('parentNode');
+                if (Str::isUuid($parentNode)) {
+                    Log::debug('有挂接点' . $parentNode);
+                    $map = ArticleCollection::where('collect_id', $anthologyId)
+                        ->orderBy('id')->get();
+                    Log::debug('查询到原map数据' . count($map));
                     $newMap = array();
                     $parentNodeLevel = -1;
                     $appended = false;
                     foreach ($map as $key => $row) {
                         $orgNode = $row;
-                        if(!$appended){
-                            if($parentNodeLevel>0){
-                                if($row->level <= $parentNodeLevel ){
+                        if (!$appended) {
+                            if ($parentNodeLevel > 0) {
+                                if ($row->level <= $parentNodeLevel) {
                                     //parent node 末尾
                                     $newNode = array();
                                     $newNode['collect_id'] = $anthologyId;
                                     $newNode['article_id'] = $newArticle->uid;
-                                    $newNode['level'] = $parentNodeLevel+1;
+                                    $newNode['level'] = $parentNodeLevel + 1;
                                     $newNode['title'] = $newArticle->title;
                                     $newNode['children'] = 0;
                                     $newMap[] = $newNode;
-                                    Log::debug('新增节点',['node'=>$newNode]);
+                                    Log::debug('新增节点', ['node' => $newNode]);
                                     $appended = true;
                                 }
-                            }else{
-                                if($row->article_id === $parentNode){
+                            } else {
+                                if ($row->article_id === $parentNode) {
                                     $parentNodeLevel = $row->level;
-                                    $orgNode['children'] = $orgNode['children']+1;
+                                    $orgNode['children'] = $orgNode['children'] + 1;
                                 }
                             }
                         }
                         $newMap[] = $orgNode;
                     }
-                    if($parentNodeLevel>0){
-                        if($appended===false){
-                        //
+                    if ($parentNodeLevel > 0) {
+                        if ($appended === false) {
+                            //
                             Log::debug('没挂上 挂到结尾');
                             $newNode = array();
                             $newNode['collect_id'] = $anthologyId;
                             $newNode['article_id'] = $newArticle->uid;
-                            $newNode['level'] = $parentNodeLevel+1;
+                            $newNode['level'] = $parentNodeLevel + 1;
                             $newNode['title'] = $newArticle->title;
                             $newNode['children'] = 0;
                             $newMap[] = $newNode;
                         }
-                    }else{
-                        Log::error('没找到挂接点'.$parentNode);
+                    } else {
+                        Log::error('没找到挂接点' . $parentNode);
                     }
-                    Log::debug('新map数据'.count($newMap));
+                    Log::debug('新map数据' . count($newMap));
 
-                    $delete = ArticleCollection::where('collect_id',$anthologyId)->delete();
-                    Log::debug('删除旧map数据'.$delete);
-                    $count=0;
+                    $delete = ArticleCollection::where('collect_id', $anthologyId)->delete();
+                    Log::debug('删除旧map数据' . $delete);
+                    $count = 0;
                     foreach ($newMap as $key => $row) {
                         $new = new ArticleCollection;
                         $new->id = app('snowflake')->id();
@@ -378,32 +394,30 @@ class ArticleController extends Controller
                         $new->level = $row["level"];
                         $new->children = $row["children"];
                         $new->editor_id = $user["user_id"];
-                        if(isset($row["deleted_at"])){
+                        if (isset($row["deleted_at"])) {
                             $new->deleted_at = $row["deleted_at"];
                         }
                         $new->save();
                         $count++;
                     }
-                    Log::debug('新map数据'.$count);
+                    Log::debug('新map数据' . $count);
                     ArticleMapController::updateCollection($anthologyId);
-                }else{
+                } else {
                     $articleMap = new ArticleCollection();
                     $articleMap->id = app('snowflake')->id();
                     $articleMap->article_id = $newArticle->uid;
-                    $articleMap->collect_id = $request->get('anthologyId');
+                    $articleMap->collect_id = $request->input('anthologyId');
                     $articleMap->title = Article::find($newArticle->uid)->title;
                     $articleMap->level = 1;
                     $articleMap->save();
                 }
-
             }
         });
-        if(Str::isUuid($newArticle->uid)){
+        if (Str::isUuid($newArticle->uid)) {
             return $this->ok(new ArticleResource($newArticle));
-        }else{
+        } else {
             return $this->error('fail');
         }
-
     }
 
     /**
@@ -412,23 +426,23 @@ class ArticleController extends Controller
      * @param  \App\Models\Article  $article
      * @return \Illuminate\Http\Response
      */
-    public function show(Request  $request,Article $article)
+    public function show(Request  $request, Article $article)
     {
         //
-        if(!$article){
+        if (!$article) {
             return $this->error("no recorder");
         }
         //判断权限
         $user = AuthApi::current($request);
-        if(!$user){
-            $user_uid="";
-        }else{
-            $user_uid=$user['user_uid'];
+        if (!$user) {
+            $user_uid = "";
+        } else {
+            $user_uid = $user['user_uid'];
         }
 
-        $canRead = ArticleController::userCanRead($user_uid,$article);
-        if(!$canRead){
-            return $this->error(__('auth.failed'),403,403);
+        $canRead = ArticleController::userCanRead($user_uid, $article);
+        if (!$canRead) {
+            return $this->error(__('auth.failed'), 403, 403);
         }
         return $this->ok(new ArticleResource($article));
     }
@@ -438,32 +452,31 @@ class ArticleController extends Controller
      * @param  string  $article
      * @return \Illuminate\Http\Response
      */
-    public function preview(Request  $request,string $articleId)
+    public function preview(Request  $request, string $articleId)
     {
         //
         $article = Article::find($articleId);
-        if(!$article){
+        if (!$article) {
             return $this->error("no recorder");
         }
         //判断权限
         $user = AuthApi::current($request);
-        if(!$user){
-            $user_uid="";
-        }else{
-            $user_uid=$user['user_uid'];
+        if (!$user) {
+            $user_uid = "";
+        } else {
+            $user_uid = $user['user_uid'];
         }
 
-        $canRead = ArticleController::userCanRead($user_uid,$article);
-        if(!$canRead){
-            return $this->error(__('auth.failed'),[],401);
+        $canRead = ArticleController::userCanRead($user_uid, $article);
+        if (!$canRead) {
+            return $this->error(__('auth.failed'), [], 401);
         }
-        if($request->has('content')){
-            $article->content = $request->get('content');
+        if ($request->has('content')) {
+            $article->content = $request->input('content');
             return $this->ok(new ArticleResource($article));
-        }else{
-            return $this->error('no content',[],200);
+        } else {
+            return $this->error('no content', [], 200);
         }
-
     }
 
     /**
@@ -476,53 +489,55 @@ class ArticleController extends Controller
     public function update(Request $request, Article $article)
     {
         //
-        if(!$article){
+        if (!$article) {
             return $this->error("no recorder");
         }
         //鉴权
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error(__('auth.failed'),401,401);
-        }else{
-            $user_uid=$user['user_uid'];
+        if (!$user) {
+            return $this->error(__('auth.failed'), 401, 401);
+        } else {
+            $user_uid = $user['user_uid'];
         }
 
-        $canEdit = ArticleController::userCanEdit($user_uid,$article);
-        if(!$canEdit){
-            return $this->error(__('auth.failed'),401,401);
+        $canEdit = ArticleController::userCanEdit($user_uid, $article);
+        if (!$canEdit) {
+            return $this->error(__('auth.failed'), 401, 401);
         }
 
         /*
         //查询标题是否重复
-        if(Article::where('title',$request->get('title'))
+        if(Article::where('title',$request->input('title'))
                   ->where('owner',$article->owner)
                   ->where('uid',"<>",$article->uid)
                   ->exists()){
             return $this->error(__('validation.exists'));
         }*/
 
-        $content = $request->get('content');
-        if($request->get('to_tpl')===true){
+        $content = $request->input('content');
+        if ($request->input('to_tpl') === true) {
             /**
              * 转化为模版
              */
-            $tplContent = $this->toTpl($content,
-                                       $request->get('anthology_id'),
-                                       $user);
+            $tplContent = $this->toTpl(
+                $content,
+                $request->input('anthology_id'),
+                $user
+            );
             $content = $tplContent;
         }
 
-        $article->title = mb_substr($request->get('title'),0,128,'UTF-8') ;
-        $article->subtitle = mb_substr($request->get('subtitle'),0,128,'UTF-8') ;
-        $article->summary = mb_substr($request->get('summary'),0,1024,'UTF-8') ;
+        $article->title = mb_substr($request->input('title'), 0, 128, 'UTF-8');
+        $article->subtitle = mb_substr($request->input('subtitle'), 0, 128, 'UTF-8');
+        $article->summary = mb_substr($request->input('summary'), 0, 1024, 'UTF-8');
         $article->content = $content;
-        $article->lang = $request->get('lang');
-        $article->status = $request->get('status',10);
+        $article->lang = $request->input('lang');
+        $article->status = $request->input('status', 10);
         $article->editor_id = $user['user_id'];
-        $article->modify_time = time()*1000;
+        $article->modify_time = time() * 1000;
         $article->save();
 
-        OpsLog::debug($user_uid,$article);
+        OpsLog::debug($user_uid, $article);
         return $this->ok(new ArticleResource($article));
     }
 
@@ -532,19 +547,19 @@ class ArticleController extends Controller
      * @param  \App\Models\Article  $article
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Request $request,Article $article)
+    public function destroy(Request $request, Article $article)
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
         //判断当前用户是否有指定的studio的权限
-        if($user['user_uid'] !== $article->owner){
+        if ($user['user_uid'] !== $article->owner) {
             return $this->error(__('auth.failed'));
         }
         $delete = 0;
-        DB::transaction(function() use($article,$delete){
+        DB::transaction(function () use ($article, $delete) {
             //TODO 删除文集中的文章
             $delete = $article->delete();
             ArticleMapController::deleteArticle($article->uid);
@@ -553,40 +568,43 @@ class ArticleController extends Controller
         return $this->ok($delete);
     }
 
-    public function toTpl($content,$anthologyId,$user){
+    public function toTpl($content, $anthologyId, $user)
+    {
         //查询书号
-        if(!Str::isUuid($anthologyId)){
+        if (!Str::isUuid($anthologyId)) {
             throw new \Exception('anthology Id not uuid');
         }
 
-        $bookId = $this->getBookId($anthologyId,$user);
+        $bookId = $this->getBookId($anthologyId, $user);
 
-        $tpl = $this->convertToTpl($content,$bookId['book'],$bookId['paragraph']);
+        $tpl = $this->convertToTpl($content, $bookId['book'], $bookId['paragraph']);
 
         //保存原文到句子表
         $customBook = $this->getCustomBookByBookId($bookId['book']);
         $sentenceSave = new SentenceApi;
-        $auth = $sentenceSave->auth($customBook->channel_id,$user['user_uid']);
-        if(!$auth){
+        $auth = $sentenceSave->auth($customBook->channel_id, $user['user_uid']);
+        if (!$auth) {
             throw new \Exception('auth fail');
         }
         foreach ($tpl['sentences'] as $key => $sentence) {
-            $sentenceSave->store($sentence,$user);
+            $sentenceSave->store($sentence, $user);
         }
         return $tpl['content'];
     }
 
-    private function getCustomBookByBookId($bookId){
-        return CustomBook::where('book_id',$bookId)->first();
+    private function getCustomBookByBookId($bookId)
+    {
+        return CustomBook::where('book_id', $bookId)->first();
     }
 
-    private function getBookId($anthologyId,$user){
-        $anthology = Collection::where('uid',$anthologyId)->first();
-        if(!$anthology){
-            throw new \Exception('anthology not exists id='.$anthologyId);
+    private function getBookId($anthologyId, $user)
+    {
+        $anthology = Collection::where('uid', $anthologyId)->first();
+        if (!$anthology) {
+            throw new \Exception('anthology not exists id=' . $anthologyId);
         }
         $bookId = $anthology->book_id;
-        if(empty($bookId)){
+        if (empty($bookId)) {
             //生成 book id
             $newBookId = CustomBook::max('book_id') + 1;
 
@@ -599,138 +617,140 @@ class ArticleController extends Controller
             $newBook->lang = $anthology->lang;
             $newBook->status = $anthology->status;
             //查询anthology所在的studio有没有符合要求的channel 没有的话，建立
-            $channelId = ChannelApi::userBookGetOrCreate($anthology->owner,$anthology->lang,$anthology->status);
-            if($channelId === false){
-                throw new \Exception('user book get fail studio='.$anthology->owner.' language='.$anthology->lang);
+            $channelId = ChannelApi::userBookGetOrCreate($anthology->owner, $anthology->lang, $anthology->status);
+            if ($channelId === false) {
+                throw new \Exception('user book get fail studio=' . $anthology->owner . ' language=' . $anthology->lang);
             }
             $newBook->channel_id = $channelId;
             $ok = $newBook->save();
-            if(!$ok){
-                throw new \Exception('user book create fail studio='.$anthology->owner.' language='.$anthology->lang);
+            if (!$ok) {
+                throw new \Exception('user book create fail studio=' . $anthology->owner . ' language=' . $anthology->lang);
             }
-            CustomBookId::where('key','max_book_number')->update(['value'=>$newBookId]);
+            CustomBookId::where('key', 'max_book_number')->update(['value' => $newBookId]);
             $bookId = $newBookId;
             $anthology->book_id = $newBookId;
             $anthology->save();
-        }else{
-            $channelId = CustomBook::where('book_id',$bookId)->value('channel_id');
+        } else {
+            $channelId = CustomBook::where('book_id', $bookId)->value('channel_id');
         }
-        $maxPara = Sentence::where('channel_uid',$channelId)
-                           ->where('book_id',$bookId)->max('paragraph');
-        if(!$maxPara){
+        $maxPara = Sentence::where('channel_uid', $channelId)
+            ->where('book_id', $bookId)->max('paragraph');
+        if (!$maxPara) {
             $maxPara = 0;
         }
-        return ['book'=>$bookId,'paragraph'=>$maxPara+1];
+        return ['book' => $bookId, 'paragraph' => $maxPara + 1];
     }
 
-    public function convertToTpl($content,$bookId,$paraStart){
+    public function convertToTpl($content, $bookId, $paraStart)
+    {
         $newSentence = array();
         $para = $paraStart;
-		$sentNum = 1;
-		$newText =  "";
-		$isTable=false;
-		$isList=false;
-		$newSent="";
-        $sentences = explode("\n",$content);
-		foreach ($sentences as $row) {
-			//$data 为一行文本
-            $listHead= "";
+        $sentNum = 1;
+        $newText =  "";
+        $isTable = false;
+        $isList = false;
+        $newSent = "";
+        $sentences = explode("\n", $content);
+        foreach ($sentences as $row) {
+            //$data 为一行文本
+            $listHead = "";
             $isList = false;
 
             $heading = false;
             $title = false;
 
-			$trimData = trim($row);
+            $trimData = trim($row);
 
             # 判断是否为list
-			$listLeft =strstr($row,"- ",true);
-			if($listLeft !== FALSE){
-                if(ctype_space($listLeft) || empty($listLeft)){
+            $listLeft = strstr($row, "- ", true);
+            if ($listLeft !== FALSE) {
+                if (ctype_space($listLeft) || empty($listLeft)) {
                     # - 左侧是空，判定为list
-                    $isList=true;
-                    $iListPos = mb_strpos($row,'- ',0,"UTF-8");
-                    $listHead = mb_substr($row,0,$iListPos+2,"UTF-8");
-                    $listBody = mb_substr($row,$iListPos+2,mb_strlen($row,"UTF-8")-$iListPos+2,"UTF-8");
+                    $isList = true;
+                    $iListPos = mb_strpos($row, '- ', 0, "UTF-8");
+                    $listHead = mb_substr($row, 0, $iListPos + 2, "UTF-8");
+                    $listBody = mb_substr($row, $iListPos + 2, mb_strlen($row, "UTF-8") - $iListPos + 2, "UTF-8");
                 }
-			}
+            }
 
             # TODO 判断是否为标题
-			$headingStart =mb_strpos($row,"# ",0,'UTF-8');
-			if($headingStart !== false){
-                $headingLeft = mb_substr($row,0,$headingStart+2,'UTF-8');
-                $title = mb_substr($row,$headingStart+2,null,'UTF-8');
-                if(str_replace('#','', trim($headingLeft)) === ''){
+            $headingStart = mb_strpos($row, "# ", 0, 'UTF-8');
+            if ($headingStart !== false) {
+                $headingLeft = mb_substr($row, 0, $headingStart + 2, 'UTF-8');
+                $title = mb_substr($row, $headingStart + 2, null, 'UTF-8');
+                if (str_replace('#', '', trim($headingLeft)) === '') {
                     # 除了#没有其他东西，那么是标题
                     $heading = $headingLeft;
                     $newText .= $headingLeft;
-                    $newText .='{{'."{$bookId}-{$para}-{$sentNum}-{$sentNum}"."}}\n";
-                    $newSentence[] = $this->newSent($bookId,$para,$sentNum,$sentNum,$title);
-                    $newSent="";
+                    $newText .= '{{' . "{$bookId}-{$para}-{$sentNum}-{$sentNum}" . "}}\n";
+                    $newSentence[] = $this->newSent($bookId, $para, $sentNum, $sentNum, $title);
+                    $newSent = "";
                     $para++;
                     $sentNum = 1;
                     continue;
                 }
-			}
-
-			//判断是否为表格开始
-			if(mb_substr($trimData,0,1,"UTF-8") == "|"){
-				$isTable=true;
-			}
-			if($trimData!="" && $isTable == true){
-				//如果是表格 不新增句子
-				$newSent .= "{$row}\n";
-				continue;
-			}
-            if($isList == true){
+            }
+
+            //判断是否为表格开始
+            if (mb_substr($trimData, 0, 1, "UTF-8") == "|") {
+                $isTable = true;
+            }
+            if ($trimData != "" && $isTable == true) {
+                //如果是表格 不新增句子
+                $newSent .= "{$row}\n";
+                continue;
+            }
+            if ($isList == true) {
                 $newSent .= $listBody;
-            }else{
+            } else {
                 $newSent .= $trimData;
             }
 
-			#生成句子编号
-			if($trimData==""){
-				#空行
-				if(strlen($newSent)>0){
-					//之前有内容
-					$newText .='{{'."{$bookId}-{$para}-{$sentNum}-{$sentNum}"."}}\n";
-                    $newSentence[] = $this->newSent($bookId,$para,$sentNum,$sentNum,$newSent);
-					$newSent="";
-				}
-				#新的段落 不插入数据库
-				$para++;
-				$sentNum = 1;
-				$newText .="\n";
-				$isTable = false; //表格开始标记
-				$isList = false;
-				continue;
-			}else{
-				$sentNum=$sentNum+10;
-			}
-
-			if(mb_substr($trimData,0,2,"UTF-8")=="{{"){
-				#已经有的句子链接不处理
-				$newText .= $trimData."\n";
-			}else{
+            #生成句子编号
+            if ($trimData == "") {
+                #空行
+                if (strlen($newSent) > 0) {
+                    //之前有内容
+                    $newText .= '{{' . "{$bookId}-{$para}-{$sentNum}-{$sentNum}" . "}}\n";
+                    $newSentence[] = $this->newSent($bookId, $para, $sentNum, $sentNum, $newSent);
+                    $newSent = "";
+                }
+                #新的段落 不插入数据库
+                $para++;
+                $sentNum = 1;
+                $newText .= "\n";
+                $isTable = false; //表格开始标记
+                $isList = false;
+                continue;
+            } else {
+                $sentNum = $sentNum + 10;
+            }
+
+            if (mb_substr($trimData, 0, 2, "UTF-8") == "{{") {
+                #已经有的句子链接不处理
+                $newText .= $trimData . "\n";
+            } else {
                 $newText .= $listHead;
-				$newText .='{{'."{$bookId}-{$para}-{$sentNum}-{$sentNum}"."}}\n";
-                $newSentence[] = $this->newSent($bookId,$para,$sentNum,$sentNum,$newSent);
-				$newSent="";
-			}
-		}
+                $newText .= '{{' . "{$bookId}-{$para}-{$sentNum}-{$sentNum}" . "}}\n";
+                $newSentence[] = $this->newSent($bookId, $para, $sentNum, $sentNum, $newSent);
+                $newSent = "";
+            }
+        }
 
         return [
-            'content' =>$newText,
-            'sentences' =>$newSentence,
+            'content' => $newText,
+            'sentences' => $newSentence,
         ];
     }
 
-    private function newSent($book,$para,$start,$end,$content){
+    private function newSent($book, $para, $start, $end, $content)
+    {
         return array(
-            'book_id'=>$book,
-            'paragraph'=>$para,
-            'word_start'=>$start,
-            'word_end'=>$end,
-            'content'=>$content,
+            'book_id' => $book,
+            'paragraph' => $para,
+            'word_start' => $start,
+            'word_end' => $end,
+            'content' => $content,
         );
     }
 }

api-v12/app/Http/Controllers/ArticleFtsController.php

@@ -1,7 +1,9 @@
 <?php
+
 /**
  * 文章全文搜索
  */
+
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
@@ -23,23 +25,23 @@ class ArticleFtsController extends Controller
     {
         //
         $pageSize = 10;
-        $pageCurrent = $request->get('from',0);
+        $pageCurrent = $request->input('from', 0);
 
         $articlesId = [];
-        if(!empty($request->get('anthology'))){
+        if (!empty($request->input('anthology'))) {
             //子节点
-            $node = ArticleCollection::where('article_id',$request->get('id'))
-                        ->where('collect_id',$request->get('anthology'))->first();
-            if($node){
-                $nodeList = ArticleCollection::where('collect_id',$request->get('anthology'))
-                                ->where('id','>=',(int)$node->id)
-                                ->orderBy('id')
-                                ->skip($request->get('from',0))
-                                ->get();
+            $node = ArticleCollection::where('article_id', $request->input('id'))
+                ->where('collect_id', $request->input('anthology'))->first();
+            if ($node) {
+                $nodeList = ArticleCollection::where('collect_id', $request->input('anthology'))
+                    ->where('id', '>=', (int)$node->id)
+                    ->orderBy('id')
+                    ->skip($request->input('from', 0))
+                    ->get();
                 $result = [];
                 $count = 0;
                 foreach ($nodeList as $curr) {
-                    if($count>0 && $curr->level <= $node->level){
+                    if ($count > 0 && $curr->level <= $node->level) {
                         break;
                     }
                     $result[] = $curr;
@@ -48,27 +50,27 @@ class ArticleFtsController extends Controller
                     $articlesId[] = $value->article_id;
                 }
             }
-        }else{
-            $articlesId[] = $request->get('id');
+        } else {
+            $articlesId[] = $request->input('id');
         }
         $total = count($articlesId);
-        $channels = explode(',',$request->get('channels'));
+        $channels = explode(',', $request->input('channels'));
         $output = [];
-        for ($i=$pageCurrent; $i <$pageCurrent+$pageSize ; $i++) {
-            if($i>=$total){
+        for ($i = $pageCurrent; $i < $pageCurrent + $pageSize; $i++) {
+            if ($i >= $total) {
                 break;
             }
             $curr = $articlesId[$i];
             foreach ($channels as $channel) {
                 # code...
-                $article = $this->fetch($curr,$channel);
+                $article = $this->fetch($curr, $channel);
                 if ($article === false) {
                     Log::error('fetch fail');
-                }else{
+                } else {
                     # code...
                     $content = $article['html'];
-                    if(!empty($request->get('key'))){
-                        if(strpos($content,$request->get('key')) !== false){
+                    if (!empty($request->input('key'))) {
+                        if (strpos($content, $request->input('key')) !== false) {
                             $output[] = $article;
                         }
                     }
@@ -76,44 +78,47 @@ class ArticleFtsController extends Controller
             }
         }
 
-        return $this->ok(['rows'=>$output,
-            'page'=>[
+        return $this->ok([
+            'rows' => $output,
+            'page' => [
                 'size' => $pageSize,
                 'current' => $pageCurrent,
                 'total' => $total
-            ],]);
+            ],
+        ]);
     }
 
-    private function fetch($articleId,$channel,$token=null){
+    private function fetch($articleId, $channel, $token = null)
+    {
         try {
             $api = config('mint.server.api.bamboo');
             $basicUrl = $api . '/v2/article/';
             $url =  $basicUrl . $articleId;;
 
             $urlParam = [
-                    'mode' => 'read',
-                    'format' => 'text',
-                    'channel' => $channel,
+                'mode' => 'read',
+                'format' => 'text',
+                'channel' => $channel,
             ];
-            Log::debug('http request',['url'=>$url,'param'=>$urlParam]);
-            if($token){
-                $response = Http::withToken($this->option('token'))->get($url,$urlParam);
-            }else{
-                $response = Http::get($url,$urlParam);
+            Log::debug('http request', ['url' => $url, 'param' => $urlParam]);
+            if ($token) {
+                $response = Http::withToken($this->option('token'))->get($url, $urlParam);
+            } else {
+                $response = Http::get($url, $urlParam);
             }
 
-            if($response->failed()){
-                Log::error('http request error'.$response->json('message'));
+            if ($response->failed()) {
+                Log::error('http request error' . $response->json('message'));
                 return false;
             }
-            if(!$response->json('ok')){
+            if (!$response->json('ok')) {
                 return false;
             }
             $article = $response->json('data');
             return $article;
-        }catch (\Throwable $th) {
+        } catch (\Throwable $th) {
             // 处理请求过程中抛出的异常
-            Log::error('fetch',['error'=>$th]);
+            Log::error('fetch', ['error' => $th]);
             return false;
         }
     }

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

@@ -21,54 +21,55 @@ class ArticleMapController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'anthology':
-                $table = ArticleCollection::where('collect_id',$request->get('id'))
-                            ->leftJoin('articles','articles.uid','=','article_collections.article_id');
+                $table = ArticleCollection::where('collect_id', $request->input('id'))
+                    ->leftJoin('articles', 'articles.uid', '=', 'article_collections.article_id');
                 break;
             case 'article':
-                $table = ArticleCollection::where('article_id',$request->get('id'))
-                            ->leftJoin('articles','articles.uid','=','article_collections.article_id');
+                $table = ArticleCollection::where('article_id', $request->input('id'))
+                    ->leftJoin('articles', 'articles.uid', '=', 'article_collections.article_id');
                 break;
         }
         $count = $table->count();
         $result = [];
-        if(!empty($request->get('parent'))){
+        if (!empty($request->input('parent'))) {
             //输出某节点的子节点
-            $node = $table->where('article_id',$request->get('parent'))->first();
-            if($node){
-                $nodeList = ArticleCollection::where('collect_id',$request->get('id'))
-                                            ->where('id','>',(int)$node->id)->orderBy('id')->get();
+            $node = $table->where('article_id', $request->input('parent'))->first();
+            if ($node) {
+                $nodeList = ArticleCollection::where('collect_id', $request->input('id'))
+                    ->where('id', '>', (int)$node->id)->orderBy('id')->get();
                 foreach ($nodeList as $key => $curr) {
-                    if($curr->level <= $node->level){
+                    if ($curr->level <= $node->level) {
                         break;
                     }
-                    if($request->has('lazy')){
-                        if($curr->level === $node->level+1){
+                    if ($request->has('lazy')) {
+                        if ($curr->level === $node->level + 1) {
                             $result[] = $curr;
                         }
-                    }else{
+                    } else {
                         $result[] = $curr;
                     }
                 }
             }
-        }else{
-            if($request->has('lazy') && $count > 300){
-                $table = $table->where('level',1);
+        } else {
+            if ($request->has('lazy') && $count > 300) {
+                $table = $table->where('level', 1);
             }
             $result = $table->select([
                 'article_collections.id',
-                'collect_id','article_id',
+                'collect_id',
+                'article_id',
                 'level',
                 'article_collections.title',
                 'children',
                 'article_collections.editor_id',
                 'article_collections.deleted_at',
                 'articles.status'
-                ])->orderBy('id')->get();
+            ])->orderBy('id')->get();
         }
 
-        return $this->ok(["rows"=>ArticleMapResource::collection($result),"count"=>$count]);
+        return $this->ok(["rows" => ArticleMapResource::collection($result), "count" => $count]);
     }
 
     /**
@@ -82,37 +83,36 @@ class ArticleMapController extends Controller
         //
 
         $validated = $request->validate([
-                'anthology_id' => 'required',
-                'operation' => 'required'
-            ]);
-        $collection  = Collection::find($request->get('anthology_id'));
-        if(!$collection){
+            'anthology_id' => 'required',
+            'operation' => 'required'
+        ]);
+        $collection  = Collection::find($request->input('anthology_id'));
+        if (!$collection) {
             return $this->error("no recorder");
         }
         //鉴权
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
-        if(!CollectionController::UserCanEdit($user["user_uid"],$collection)){
-            Log::error($user["user_uid"].'无文集编辑权限'.$collection->uid);
+        if (!CollectionController::UserCanEdit($user["user_uid"], $collection)) {
+            Log::error($user["user_uid"] . '无文集编辑权限' . $collection->uid);
             return $this->error(__('auth.failed'));
         }
         switch ($validated['operation']) {
             case 'add':
                 # 添加多个文章到文集
-                $count=0;
-                foreach ($request->get('article_id') as $key => $article) {
+                $count = 0;
+                foreach ($request->input('article_id') as $key => $article) {
                     # code...
 
-                    if(!ArticleCollection::where('article_id',$article)
-                                        ->where('collect_id',$request->get('anthology_id'))
-                                        ->exists())
-                    {
+                    if (!ArticleCollection::where('article_id', $article)
+                        ->where('collect_id', $request->input('anthology_id'))
+                        ->exists()) {
                         $new = new ArticleCollection;
                         $new->id = app('snowflake')->id();
                         $new->article_id = $article;
-                        $new->collect_id = $request->get('anthology_id');
+                        $new->collect_id = $request->input('anthology_id');
                         $new->title = Article::find($article)->title;
                         $new->level = 1;
                         $new->editor_id = $user["user_id"];
@@ -137,16 +137,15 @@ class ArticleMapController extends Controller
     public function show(string $articleCollection)
     {
         //
-        $id = explode('_',$articleCollection);
-        $result = ArticleCollection::where('article_id',$id[0])
-                    ->where('collect_id',$id[1])
-                    ->first();
-        if($result){
+        $id = explode('_', $articleCollection);
+        $result = ArticleCollection::where('article_id', $id[0])
+            ->where('collect_id', $id[1])
+            ->first();
+        if ($result) {
             return $this->ok(new ArticleMapResource($result));
-        }else{
+        } else {
             return $this->error('no');
         }
-
     }
 
     /**
@@ -164,23 +163,23 @@ class ArticleMapController extends Controller
         ]);
 
         $collection  = Collection::find($id);
-        if(!$collection){
+        if (!$collection) {
             return $this->error("no recorder");
         }
         //鉴权
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
-        if(!CollectionController::UserCanEdit($user["user_uid"],$collection)){
+        if (!CollectionController::UserCanEdit($user["user_uid"], $collection)) {
             return $this->error(__('auth.failed'));
         }
 
         switch ($validated['operation']) {
             case 'anthology':
-                $delete = ArticleCollection::where('collect_id',$id)->delete();
-                $count=0;
-                foreach ($request->get('data') as $key => $row) {
+                $delete = ArticleCollection::where('collect_id', $id)->delete();
+                $count = 0;
+                foreach ($request->input('data') as $key => $row) {
                     # code...
                     $new = new ArticleCollection;
                     $new->id = app('snowflake')->id();
@@ -190,7 +189,7 @@ class ArticleMapController extends Controller
                     $new->level = $row["level"];
                     $new->children = $row["children"];
                     $new->editor_id = $user["user_id"];
-                    if(isset($row["deleted_at"])){
+                    if (isset($row["deleted_at"])) {
                         $new->deleted_at = $row["deleted_at"];
                     }
                     $new->save();
@@ -213,48 +212,51 @@ class ArticleMapController extends Controller
         //
     }
 
-    public static function deleteArticle(string $articleId){
+    public static function deleteArticle(string $articleId)
+    {
         //查找有这个文章的文集
-        $collections = ArticleCollection::where('article_id',$articleId)
-                                        ->select('collect_id')
-                                        ->groupBy('collect_id')
-                                        ->get();
+        $collections = ArticleCollection::where('article_id', $articleId)
+            ->select('collect_id')
+            ->groupBy('collect_id')
+            ->get();
         //设置为删除
-        ArticleCollection::where('article_id',$articleId)
-                         ->update(['deleted_at'=>now()]);
+        ArticleCollection::where('article_id', $articleId)
+            ->update(['deleted_at' => now()]);
         //查找没有下级文章的文集
-        $updateCollections = ArticleCollection::where('article_id',$articleId)
-                                            ->where('children',0)
-                                            ->select('collect_id')
-                                            ->groupBy('collect_id')
-                                            ->get();
+        $updateCollections = ArticleCollection::where('article_id', $articleId)
+            ->where('children', 0)
+            ->select('collect_id')
+            ->groupBy('collect_id')
+            ->get();
         //真的删除没有下级文章的文集中的文章
-        $count = ArticleCollection::where('article_id',$articleId)
-                                  ->where('children',0)
-                                  ->delete();
+        $count = ArticleCollection::where('article_id', $articleId)
+            ->where('children', 0)
+            ->delete();
         //更新改动的文集
         foreach ($updateCollections as  $collection) {
             # code...
             ArticleMapController::updateCollection($collection->collect_id);
         }
-        return [count($collections),$count];
+        return [count($collections), $count];
     }
 
-    public static function deleteCollection(string $collectionId){
-        $count = ArticleCollection::where('collect_id',$collectionId)
-                                  ->delete();
+    public static function deleteCollection(string $collectionId)
+    {
+        $count = ArticleCollection::where('collect_id', $collectionId)
+            ->delete();
         return $count;
     }
 
     /**
      * 用表中的数据生成json，更新collection 表中的字段
      */
-    public static function updateCollection(string $collectionId){
-        $result = ArticleCollection::where('collect_id',$collectionId)
-                        ->select(['article_id','level','title'])
-                        ->orderBy('id')->get();
-        Collection::where('uid',$collectionId)
-                  ->update(['article_list'=>json_encode($result,JSON_UNESCAPED_UNICODE)]);
+    public static function updateCollection(string $collectionId)
+    {
+        $result = ArticleCollection::where('collect_id', $collectionId)
+            ->select(['article_id', 'level', 'title'])
+            ->orderBy('id')->get();
+        Collection::where('uid', $collectionId)
+            ->update(['article_list' => json_encode($result, JSON_UNESCAPED_UNICODE)]);
         return count($result);
     }
 }

api-v12/app/Http/Controllers/ArticleNavController.php

@@ -16,9 +16,9 @@ class ArticleNavController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get('type')) {
+        switch ($request->input('type')) {
             case 'chapter':
-                $para = explode('-', $request->get('id'));
+                $para = explode('-', $request->input('id'));
                 $prev = PaliText::where('book', $para[0])
                     ->where('paragraph', '<', $para[1])
                     ->where('level', '<', 8)
@@ -41,7 +41,7 @@ class ArticleNavController extends Controller
                 }
                 break;
             case 'para':
-                $para = explode('-', $request->get('id'));
+                $para = explode('-', $request->input('id'));
                 $prev = PaliText::where('book', $para[0])
                     ->where('paragraph', '<', $para[1])
                     ->orderBy('paragraph', 'desc')

api-v12/app/Http/Controllers/ArticleProgressController.php

@@ -20,40 +20,40 @@ class ArticleProgressController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'chapter':
-                $chapter = PaliTextApi::getChapterStartEnd($request->get('book'),$request->get('para'));
-                $channels = Sentence::where('book_id',$request->get('book'))
-                                    ->whereBetween('paragraph',$chapter)
-                                    ->where('strlen','>',0)
-                                    ->groupBy('channel_uid')
-                                    ->select('channel_uid')
-                                    ->get();
+                $chapter = PaliTextApi::getChapterStartEnd($request->input('book'), $request->input('para'));
+                $channels = Sentence::where('book_id', $request->input('book'))
+                    ->whereBetween('paragraph', $chapter)
+                    ->where('strlen', '>', 0)
+                    ->groupBy('channel_uid')
+                    ->select('channel_uid')
+                    ->get();
                 //获取单句长度
-                $sentLen = PaliSentence::where('book',$request->get('book'))
-                            ->whereBetween('paragraph',$chapter)
-                            ->orderBy('word_begin')
-                            ->select(['book','paragraph','word_begin','word_end','length'])
-                            ->get();
+                $sentLen = PaliSentence::where('book', $request->input('book'))
+                    ->whereBetween('paragraph', $chapter)
+                    ->orderBy('word_begin')
+                    ->select(['book', 'paragraph', 'word_begin', 'word_end', 'length'])
+                    ->get();
                 //获取每个channel的完成度
                 foreach ($channels as $key => $value) {
                     # code...
-                    $finished = Sentence::where('book_id',$request->get('book'))
-                    ->whereBetween('paragraph',$chapter)
-                    ->where('channel_uid',$value->channel_uid)
-                    ->where('strlen','>',0)
-                    ->select(['strlen','book_id','paragraph','word_start','word_end'])
-                    ->get();
-                    $final=[];
+                    $finished = Sentence::where('book_id', $request->input('book'))
+                        ->whereBetween('paragraph', $chapter)
+                        ->where('channel_uid', $value->channel_uid)
+                        ->where('strlen', '>', 0)
+                        ->select(['strlen', 'book_id', 'paragraph', 'word_start', 'word_end'])
+                        ->get();
+                    $final = [];
                     foreach ($sentLen as  $sent) {
                         # code...
-                        $first = Arr::first($finished, function ($value, $key) use($sent) {
-                            return ($value->book_id==$sent->book &&
-                                    $value->paragraph==$sent->paragraph &&
-                                    $value->word_start==$sent->word_begin &&
-                                    $value->word_end==$sent->word_end);
+                        $first = Arr::first($finished, function ($value, $key) use ($sent) {
+                            return ($value->book_id == $sent->book &&
+                                $value->paragraph == $sent->paragraph &&
+                                $value->word_start == $sent->word_begin &&
+                                $value->word_end == $sent->word_end);
                         });
-                        $final[] = [$sent->length,$first?true:false];
+                        $final[] = [$sent->length, $first ? true : false];
                     }
                     $value['final'] = $final;
                 }

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

@@ -28,38 +28,40 @@ class AttachmentController extends Controller
     public function index(Request $request)
     {
         //
-		switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'studio':
                 $user = AuthApi::current($request);
-                if(!$user){
+                if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
                 //判断当前用户是否有指定的studio的权限
-                if($user['user_uid'] !== StudioApi::getIdByName($request->get('studio'))){
+                if ($user['user_uid'] !== StudioApi::getIdByName($request->input('studio'))) {
                     return $this->error(__('auth.failed'));
                 }
                 $table = Attachment::where('owner_uid', $user["user_uid"]);
                 break;
             default:
-                return $this->error("error view",[],200);
-            break;
+                return $this->error("error view", [], 200);
+                break;
         }
-        if($request->has('search')){
-            $table = $table->where('title', 'like', $request->get('search')."%");
+        if ($request->has('search')) {
+            $table = $table->where('title', 'like', $request->input('search') . "%");
         }
-        if($request->has('content_type')){
-            $table = $table->where('content_type', 'like', $request->get('content_type')."%");
+        if ($request->has('content_type')) {
+            $table = $table->where('content_type', 'like', $request->input('content_type') . "%");
         }
         $count = $table->count();
-        $table = $table->orderBy($request->get('order','updated_at'),
-                                 $request->get('dir','desc'));
+        $table = $table->orderBy(
+            $request->input('order', 'updated_at'),
+            $request->input('dir', 'desc')
+        );
 
-        $table = $table->skip($request->get('offset',0))
-                       ->take($request->get('limit',1000));
+        $table = $table->skip($request->input('offset', 0))
+            ->take($request->input('limit', 1000));
 
         $result = $table->get();
 
-        return $this->ok(["rows"=>AttachmentResource::collection($result),"count"=>$count]);
+        return $this->ok(["rows" => AttachmentResource::collection($result), "count" => $count]);
     }
 
     /**
@@ -71,8 +73,8 @@ class AttachmentController extends Controller
     public function store(Request $request)
     {
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error(__('auth.failed'),401,401);
+        if (!$user) {
+            return $this->error(__('auth.failed'), 401, 401);
         }
 
         $request->validate([
@@ -80,14 +82,14 @@ class AttachmentController extends Controller
         ]);
 
         $isCreate = true;
-        if(Str::isUuid($request->get('id'))){
-            $attachment = Attachment::find($request->get('id'));
-            if(!$attachment){
+        if (Str::isUuid($request->input('id'))) {
+            $attachment = Attachment::find($request->input('id'));
+            if (!$attachment) {
                 return $this->error('no res');
             }
             $fileId = $attachment->id;
             $isCreate = false;
-        }else{
+        } else {
             $fileId = Str::uuid();
         }
 
@@ -96,34 +98,34 @@ class AttachmentController extends Controller
 
         $ext = $file->getClientOriginalExtension();
 
-        if($request->get('type') === 'avatar'){
+        if ($request->input('type') === 'avatar') {
             $resize = Image::make($file)->fit(512);
-            Storage::put($bucket.'/'.$fileId.'.jpg',$resize->stream());
+            Storage::put($bucket . '/' . $fileId . '.jpg', $resize->stream());
             $resize = Image::make($file)->fit(256);
-            Storage::put($bucket.'/'.$fileId.'_m.jpg',$resize->stream());
+            Storage::put($bucket . '/' . $fileId . '_m.jpg', $resize->stream());
             $resize = Image::make($file)->fit(128);
-            Storage::put($bucket.'/'.$fileId.'_s.jpg',$resize->stream());
-            $name = $fileId.'.jpg';
-        }else{
+            Storage::put($bucket . '/' . $fileId . '_s.jpg', $resize->stream());
+            $name = $fileId . '.jpg';
+        } else {
             //Move Uploaded File
-            $name = $fileId.'.'.$ext;
-            if(!$isCreate){
+            $name = $fileId . '.' . $ext;
+            if (!$isCreate) {
                 //替换模式，先删除旧文件
-                Storage::delete($bucket.'/'.$name);
+                Storage::delete($bucket . '/' . $name);
             }
-            $filename = $file->storeAs($bucket,$name);
+            $filename = $file->storeAs($bucket, $name);
         }
 
-        if($isCreate){
+        if ($isCreate) {
             $attachment = new Attachment;
             $attachment->id = $fileId;
             $attachment->bucket = $bucket;
-            if($request->has('studio')){
-                $owner_uid = StudioApi::getIdByName($request->get('studio'));
-            }else{
+            if ($request->has('studio')) {
+                $owner_uid = StudioApi::getIdByName($request->input('studio'));
+            } else {
                 $owner_uid = $user['user_uid'];
             }
-            if($owner_uid){
+            if ($owner_uid) {
                 $attachment->owner_uid = $owner_uid;
             }
             $attachment->status = 'public';
@@ -138,17 +140,17 @@ class AttachmentController extends Controller
         $attachment->content_type = $file->getMimeType();
         $attachment->save();
 
-        $type = explode('/',$file->getMimeType());
+        $type = explode('/', $file->getMimeType());
         switch ($type[0]) {
             case 'image':
                 $thumbnail = Image::make($file);
                 break;
             case 'video':
-                $tmpFile = $file->storeAs($bucket,$name,'local');
-                $path = storage_path('app/'.$tmpFile);
+                $tmpFile = $file->storeAs($bucket, $name, 'local');
+                $path = storage_path('app/' . $tmpFile);
                 if (App::environment('local')) {
                     $ffmpeg = FFMpeg::create();
-                }else{
+                } else {
                     $ffmpeg = FFMpeg::create(array(
                         'ffmpeg.binaries' => '/usr/bin/ffmpeg',
                         'ffprobe.binaries' => '/usr/bin/ffprobe',
@@ -167,23 +169,22 @@ class AttachmentController extends Controller
                 # code...
                 break;
         }
-        if(isset($thumbnail)){
+        if (isset($thumbnail)) {
             //生成缩略图
             $thumbnail->resize(256, 256, function ($constraint) {
                 $constraint->aspectRatio();
             });
-            Storage::put($bucket.'/'.$fileId.'_m.jpg',$thumbnail->stream());
+            Storage::put($bucket . '/' . $fileId . '_m.jpg', $thumbnail->stream());
             $thumbnail->resize(128, 128, function ($constraint) {
                 $constraint->aspectRatio();
             });
-            Storage::put($bucket.'/'.$fileId.'_s.jpg',$thumbnail->stream());
+            Storage::put($bucket . '/' . $fileId . '_s.jpg', $thumbnail->stream());
             //销毁图片资源
             $thumbnail->destroy();
         }
 
 
         return $this->ok(new AttachmentResource($attachment));
-
     }
 
     /**
@@ -209,11 +210,11 @@ class AttachmentController extends Controller
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error(__('auth.failed'),401,401);
+        if (!$user) {
+            return $this->error(__('auth.failed'), 401, 401);
         }
 
-        $attachment->title = $request->get('title');
+        $attachment->title = $request->input('title');
         $attachment->save();
         return $this->ok(new AttachmentResource($attachment));
     }
@@ -224,42 +225,42 @@ class AttachmentController extends Controller
      * @param  string  $id
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Request $request,string $id)
+    public function destroy(Request $request, string $id)
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error(__('auth.failed'),401,401);
+        if (!$user) {
+            return $this->error(__('auth.failed'), 401, 401);
         }
-        if(Str::isUuid($id)){
-            $res = Attachment::where('id',$id)->first();
-        }else{
+        if (Str::isUuid($id)) {
+            $res = Attachment::where('id', $id)->first();
+        } else {
             /**
              * 从文件名获取bucket和name
              */
-            $pos = mb_strrpos($request->get('name'),'/',0,"UTF-8");
-            if($pos === false){
-                return $this->error('无效的文件名',500,500);
+            $pos = mb_strrpos($request->input('name'), '/', 0, "UTF-8");
+            if ($pos === false) {
+                return $this->error('无效的文件名', 500, 500);
             }
-            $bucket = mb_substr($request->get('name'),0,$pos,'UTF-8');
-            $name = mb_substr($request->get('name'),$pos+1,NULL,'UTF-8');
-            $res = Attachment::where('bucket',$bucket)
-                            ->where('name',$name)
-                            ->first();
+            $bucket = mb_substr($request->input('name'), 0, $pos, 'UTF-8');
+            $name = mb_substr($request->input('name'), $pos + 1, NULL, 'UTF-8');
+            $res = Attachment::where('bucket', $bucket)
+                ->where('name', $name)
+                ->first();
         }
-        if(!$res){
+        if (!$res) {
             return $this->error('no res');
         }
-        if($user['user_uid'] !== $res->user_uid){
-            return $this->error(__('auth.failed'),403,403);
+        if ($user['user_uid'] !== $res->user_uid) {
+            return $this->error(__('auth.failed'), 403, 403);
         }
 
         //删除文件
         $filename = $res->bucket . '/' . $res->name;
         $path_parts = pathinfo($res->name);
         Storage::delete($filename);
-        Storage::delete($res->bucket.'/'.$path_parts['filename'].'_m.jpg');
-        Storage::delete($res->bucket.'/'.$path_parts['filename'].'_s.jpg');
+        Storage::delete($res->bucket . '/' . $path_parts['filename'] . '_m.jpg');
+        Storage::delete($res->bucket . '/' . $path_parts['filename'] . '_s.jpg');
 
         $del = $res->delete();
         return $this->ok($del);

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

@@ -73,12 +73,12 @@ class AuthController extends Controller
     {
 
         $query = UserInfo::where(function ($query) use ($request) {
-            $query->where('username', $request->get('username'))
-                ->where('password', md5($request->get('password')));
+            $query->where('username', $request->input('username'))
+                ->where('password', md5($request->input('password')));
         })
             ->orWhere(function ($query) use ($request) {
-                $query->where('email', $request->get('username'))
-                    ->where('password', md5($request->get('password')));
+                $query->where('email', $request->input('username'))
+                    ->where('password', md5($request->input('password')));
             });
         //Log::info($query->toSql());
         $user = $query->first();

api-v12/app/Http/Controllers/BlogController.php

@@ -187,7 +187,7 @@ class BlogController extends Controller
     // 搜索
     public function search(Request $request)
     {
-        $query = $request->get('q');
+        $query = $request->input('q');
 
         if (empty($query)) {
             return redirect()->route('blog.index');

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

@@ -50,15 +50,15 @@ class ChannelController extends Controller
         if ($request->has("book")) {
             $indexCol[] = 'progress_chapters.progress';
         }
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'public':
                 $table = Channel::select($indexCol)
                     ->where('status', 30);
                 /*
                 if ($request->has("book")) {
                     $table = $table->leftJoin('progress_chapters', 'channels.uid', '=', 'progress_chapters.channel_id',)
-                        ->where('progress_chapters.book', $request->get("book"))
-                        ->where('progress_chapters.para', $request->get("paragraph"));
+                        ->where('progress_chapters.book', $request->input("book"))
+                        ->where('progress_chapters.para', $request->input("paragraph"));
                 }*/
                 break;
             case 'studio':
@@ -68,13 +68,13 @@ class ChannelController extends Controller
                     return $this->error(__('auth.failed'));
                 }
                 //判断当前用户是否有指定的studio的权限
-                $studioId = StudioApi::getIdByName($request->get('name'));
+                $studioId = StudioApi::getIdByName($request->input('name'));
                 if (!StudioApi::userCanList($user['user_uid'], $studioId)) {
                     return $this->error(__('auth.failed'), 403, 403);
                 }
 
                 $table = Channel::select($indexCol);
-                if ($request->get('view2', 'my') === 'my') {
+                if ($request->input('view2', 'my') === 'my') {
                     $table = $table->where('owner_uid', $studioId);
                 } else {
                     //协作
@@ -84,8 +84,8 @@ class ChannelController extends Controller
                         $resId[] = $res['res_id'];
                     }
                     $table = $table->whereIn('channels.uid', $resId);
-                    if ($request->get('collaborator', 'all') !== 'all') {
-                        $table = $table->where('owner_uid', $request->get('collaborator'));
+                    if ($request->input('collaborator', 'all') !== 'all') {
+                        $table = $table->where('owner_uid', $request->input('collaborator'));
                     } else {
                         $table = $table->where('owner_uid', '<>', $studioId);
                     }
@@ -101,7 +101,7 @@ class ChannelController extends Controller
                     return $this->error(__('auth.failed'));
                 }
                 //判断当前用户是否有指定的studio的权限
-                if ($user['user_uid'] !== StudioApi::getIdByName($request->get('name'))) {
+                if ($user['user_uid'] !== StudioApi::getIdByName($request->input('name'))) {
                     return $this->error(__('auth.failed'));
                 }
                 $channelById = [];
@@ -157,8 +157,8 @@ class ChannelController extends Controller
                     $channelById[$value['res_id']] = $value;
                 }
                 //获取全网公开channel
-                $chapter = PaliTextApi::getChapterStartEnd($request->get('book'), $request->get('para'));
-                $publicChannelsWithContent = Sentence::where('book_id', $request->get('book'))
+                $chapter = PaliTextApi::getChapterStartEnd($request->input('book'), $request->input('para'));
+                $publicChannelsWithContent = Sentence::where('book_id', $request->input('book'))
                     ->whereBetween('paragraph', $chapter)
                     ->where('strlen', '>', 0)
                     ->where('status', 30)
@@ -185,49 +185,49 @@ class ChannelController extends Controller
                 break;
             case 'id':
                 $table = Channel::select($indexCol)
-                    ->whereIn('uid', explode(',', $request->get("id")));
+                    ->whereIn('uid', explode(',', $request->input("id")));
         }
 
         if ($request->has("book")) {
-            if ($request->get("view") === "public") {
+            if ($request->input("view") === "public") {
                 $table = $table->leftJoin('progress_chapters', 'channels.uid', '=', 'progress_chapters.channel_id',)
-                    ->where('progress_chapters.book', $request->get("book"))
-                    ->where('progress_chapters.para', $request->get("paragraph"));
+                    ->where('progress_chapters.book', $request->input("book"))
+                    ->where('progress_chapters.para', $request->input("paragraph"));
             } else {
                 $table = $table->leftJoin('progress_chapters', function ($join) use ($request) {
                     $join->on('channels.uid', '=', 'progress_chapters.channel_id')
-                        ->where('progress_chapters.book', $request->get("book"))
-                        ->where('progress_chapters.para', $request->get("paragraph")); // 条件写在这里！
+                        ->where('progress_chapters.book', $request->input("book"))
+                        ->where('progress_chapters.para', $request->input("paragraph")); // 条件写在这里！
                 });
             }
 
             /* leftJoin('progress_chapters', 'channels.uid', '=', 'progress_chapters.channel_id',)
-                ->where('progress_chapters.book', $request->get("book"))
-                ->where('progress_chapters.para', $request->get("paragraph"));*/
+                ->where('progress_chapters.book', $request->input("book"))
+                ->where('progress_chapters.para', $request->input("paragraph"));*/
         }
         //处理搜索
-        if (!empty($request->get("search"))) {
-            $table = $table->where('name', 'like', "%" . $request->get("search") . "%");
+        if (!empty($request->input("search"))) {
+            $table = $table->where('name', 'like', "%" . $request->input("search") . "%");
         }
         if ($request->has("type")) {
-            $table = $table->where('type', $request->get("type"));
+            $table = $table->where('type', $request->input("type"));
         }
         if ($request->has("updated_at")) {
-            $table = $table->where('updated_at', '>', $request->get("updated_at"));
+            $table = $table->where('updated_at', '>', $request->input("updated_at"));
         }
         if ($request->has("created_at")) {
-            $table = $table->where('created_at', '>', $request->get("created_at"));
+            $table = $table->where('created_at', '>', $request->input("created_at"));
         }
         //获取记录总条数
         $count = $table->count();
         //处理排序
         $table = $table->orderBy(
-            $request->get("order", 'created_at'),
-            $request->get("dir", 'desc')
+            $request->input("order", 'created_at'),
+            $request->input("dir", 'desc')
         );
         //处理分页
-        $table = $table->skip($request->get("offset", 0))
-            ->take($request->get("limit", 200));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input("limit", 200));
         Log::debug('channel sql ' . $table->toSql());
         //获取数据
         $result = $table->get();
@@ -236,7 +236,7 @@ class ChannelController extends Controller
             if ($request->has('progress')) {
                 //获取进度
                 //获取单句长度
-                $sentLen = PaliSentence::where('book', $request->get('book'))
+                $sentLen = PaliSentence::where('book', $request->input('book'))
                     ->whereBetween('paragraph', $chapter)
                     ->orderBy('word_begin')
                     ->select(['book', 'paragraph', 'word_begin', 'word_end', 'length'])
@@ -245,7 +245,7 @@ class ChannelController extends Controller
             foreach ($result as $key => $value) {
                 if ($request->has('progress')) {
                     //获取进度
-                    $finalTable = Sentence::where('book_id', $request->get('book'))
+                    $finalTable = Sentence::where('book_id', $request->input('book'))
                         ->whereBetween('paragraph', $chapter)
                         ->where('channel_uid', $value->uid)
                         ->where('strlen', '>', 0)
@@ -312,7 +312,7 @@ class ChannelController extends Controller
             return $this->error(__('auth.failed'));
         }
         //判断当前用户是否有指定的studio的权限
-        $studioId = StudioApi::getIdByName($request->get('studio'));
+        $studioId = StudioApi::getIdByName($request->input('studio'));
         if ($user['user_uid'] !== $studioId) {
             return $this->error(__('auth.failed'));
         }
@@ -338,7 +338,7 @@ class ChannelController extends Controller
     {
         $indexCol = ['uid', 'name', 'summary', 'type', 'owner_uid', 'lang', 'status', 'updated_at', 'created_at'];
 
-        $sent = $request->get('sentence');
+        $sent = $request->input('sentence');
         $query = [];
         $queryWithChannel = [];
         $sentContainer = [];
@@ -389,7 +389,7 @@ class ChannelController extends Controller
         $channelId = [];
 
         //获取全网公开的有译文的channel
-        if ($request->get('owner') === 'all' || $request->get('owner') === 'public') {
+        if ($request->input('owner') === 'all' || $request->input('owner') === 'public') {
             if (count($query) > 0) {
                 $publicChannelsWithContent = Sentence::whereIns(['book_id', 'paragraph', 'word_start', 'word_end'], $query)
                     ->where('strlen', '>', 0)
@@ -414,7 +414,7 @@ class ChannelController extends Controller
         $user = AuthApi::current($request);
         if ($user !== false) {
             //我自己的
-            if ($request->get('owner') === 'all' || $request->get('owner') === 'my') {
+            if ($request->input('owner') === 'all' || $request->input('owner') === 'my') {
                 $my = Channel::select($indexCol)->where('owner_uid', $user['user_uid'])->get();
                 foreach ($my as $key => $value) {
                     $channelId[] = $value->uid;
@@ -427,7 +427,7 @@ class ChannelController extends Controller
             }
 
             //获取共享channel
-            if ($request->get('owner') === 'all' || $request->get('owner') === 'collaborator') {
+            if ($request->input('owner') === 'all' || $request->input('owner') === 'collaborator') {
                 $allSharedChannels = ShareApi::getResList($user['user_uid'], 2);
                 foreach ($allSharedChannels as $key => $value) {
                     # code...
@@ -542,13 +542,13 @@ class ChannelController extends Controller
             return $this->error(__('auth.failed'), 401, 401);
         }
         //判断当前用户是否有指定的studio的权限
-        $studioId = StudioApi::getIdByName($request->get('studio'));
+        $studioId = StudioApi::getIdByName($request->input('studio'));
         if (!StudioApi::userCanManage($user['user_uid'], $studioId)) {
             return $this->error(__('auth.failed'), 403, 403);
         }
         $studio = StudioApi::getById($studioId);
         //查询是否重复
-        if (Channel::where('name', $request->get('name'))
+        if (Channel::where('name', $request->input('name'))
             ->where('owner_uid', $studioId)
             ->exists()
         ) {
@@ -557,10 +557,10 @@ class ChannelController extends Controller
 
         $channel = new Channel;
         $channel->id = app('snowflake')->id();
-        $channel->name = $request->get('name');
+        $channel->name = $request->input('name');
         $channel->owner_uid = $studioId;
-        $channel->type = $request->get('type');
-        $channel->lang = $request->get('lang');
+        $channel->type = $request->input('type');
+        $channel->lang = $request->input('lang');
         $channel->editor_id = $user['user_id'];
         if (isset($studio['roles'])) {
             if (in_array('basic', $studio['roles'])) {
@@ -630,16 +630,16 @@ class ChannelController extends Controller
         }
         if ($channel->owner_uid !== $user["user_uid"]) {
             //判断是否为协作
-            $power = ShareApi::getResPower($user["user_uid"], $request->get('id'));
+            $power = ShareApi::getResPower($user["user_uid"], $request->input('id'));
             if ($power < 30) {
                 return $this->error(__('auth.failed'), 403, 403);
             }
         }
-        $channel->name = $request->get('name');
-        $channel->type = $request->get('type');
-        $channel->summary = $request->get('summary');
-        $channel->lang = $request->get('lang');
-        $channel->status = $request->get('status');
+        $channel->name = $request->input('name');
+        $channel->type = $request->input('type');
+        $channel->summary = $request->input('summary');
+        $channel->lang = $request->input('lang');
+        $channel->status = $request->input('status');
         $channel->save();
         return $this->ok($channel);
     }
@@ -662,28 +662,28 @@ class ChannelController extends Controller
         }
         if ($channel->owner_uid !== $user["user_uid"]) {
             //判断是否为协作
-            $power = ShareApi::getResPower($user["user_uid"], $request->get('id'));
+            $power = ShareApi::getResPower($user["user_uid"], $request->input('id'));
             if ($power < 30) {
                 return $this->error(__('auth.failed'), [], 403);
             }
         }
         if ($request->has('name')) {
-            $channel->name = $request->get('name');
+            $channel->name = $request->input('name');
         }
         if ($request->has('type')) {
-            $channel->type = $request->get('type');
+            $channel->type = $request->input('type');
         }
         if ($request->has('summary')) {
-            $channel->summary = $request->get('summary');
+            $channel->summary = $request->input('summary');
         }
         if ($request->has('lang')) {
-            $channel->lang = $request->get('lang');
+            $channel->lang = $request->input('lang');
         }
         if ($request->has('status')) {
-            $channel->status = $request->get('status');
+            $channel->status = $request->input('status');
         }
         if ($request->has('config')) {
-            $channel->status = $request->get('config');
+            $channel->status = $request->input('config');
         }
         $channel->save();
         return $this->ok($channel);

api-v12/app/Http/Controllers/ChannelIOController.php

@@ -15,24 +15,32 @@ class ChannelIOController extends Controller
     public function index(Request $request)
     {
         //
-        $table = Channel::select(['uid','name','summary',
-                                'type','owner_uid','lang',
-                                'status','updated_at','created_at']);
-        switch ($request->get('view')) {
+        $table = Channel::select([
+            'uid',
+            'name',
+            'summary',
+            'type',
+            'owner_uid',
+            'lang',
+            'status',
+            'updated_at',
+            'created_at'
+        ]);
+        switch ($request->input('view')) {
             case 'public':
-                $table->where('status',30)
-                      ->where('updated_at','>',$request->get('updated_at','2000-1-1'));
+                $table->where('status', 30)
+                    ->where('updated_at', '>', $request->input('updated_at', '2000-1-1'));
                 break;
         }
         $count = $table->count();
         //处理排序
-        $table->orderBy('updated_at','asc');
+        $table->orderBy('updated_at', 'asc');
         //处理分页
-        $table->skip($request->get("offset",0))
-              ->take($request->get("limit",200));
+        $table->skip($request->input("offset", 0))
+            ->take($request->input("limit", 200));
         //获取数据
         $result = $table->get();
-        return $this->ok(["rows"=>$result,"count"=>$count]);
+        return $this->ok(["rows" => $result, "count" => $count]);
     }
 
     /**

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

@@ -98,10 +98,10 @@ class ChapterContentController extends Controller
 
         $channels = [];
         if ($request->has('channels')) {
-            if (strpos($request->get('channels'), ',') === FALSE) {
-                $_channels = explode('_', $request->get('channels'));
+            if (strpos($request->input('channels'), ',') === FALSE) {
+                $_channels = explode('_', $request->input('channels'));
             } else {
-                $_channels = explode(',', $request->get('channels'));
+                $_channels = explode(',', $request->input('channels'));
             }
             foreach ($_channels as $key => $channel) {
                 if (Str::isUuid($channel)) {
@@ -110,7 +110,7 @@ class ChapterContentController extends Controller
             }
         }
 
-        $mode = $request->get('mode', 'read');
+        $mode = $request->input('mode', 'read');
         if ($mode === 'read') {
             //阅读模式加载html格式原文
             $channelId = ChannelApi::getSysChannel('_System_Pali_VRI_');
@@ -211,8 +211,8 @@ class ChapterContentController extends Controller
             }
         }
 
-        $pFrom = $request->get('from', $paraFrom);
-        $pTo = $request->get('to', $paraTo);
+        $pFrom = $request->input('from', $paraFrom);
+        $pTo = $request->input('to', $paraTo);
         //根据句子的长度找到这次应该加载的段落
 
         $paliText = PaliText::select(['paragraph', 'lenght'])
@@ -252,8 +252,8 @@ class ChapterContentController extends Controller
             $this->result['from'] = $currTo + 1;
             $this->result['to'] = $pTo;
             $this->result['paraId'] = $id;
-            $this->result['channels'] = $request->get('channels');
-            $this->result['mode'] = $request->get('mode');
+            $this->result['channels'] = $request->input('channels');
+            $this->result['mode'] = $request->input('mode');
         }
 
         return $this->ok($this->result);

api-v12/app/Http/Controllers/ChapterController.php

@@ -17,14 +17,14 @@ class ChapterController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'toc':
-                $chapter = PaliText::where('book', $request->get('book'))
-                    ->where('paragraph', $request->get('para'))
+                $chapter = PaliText::where('book', $request->input('book'))
+                    ->where('paragraph', $request->input('para'))
                     ->first();
-                $start = $request->get('para');
-                $end = $request->get('para') + $chapter->chapter_len - 1;
-                $table = PaliText::where('book', $request->get('book'))
+                $start = $request->input('para');
+                $end = $request->input('para') + $chapter->chapter_len - 1;
+                $table = PaliText::where('book', $request->input('book'))
                     ->whereBetween('paragraph', [$start, $end])
                     ->where('level', '<', 100)
                     ->select(['book', 'paragraph', 'level', 'text', 'chapter_len', 'chapter_strlen', 'parent']);
@@ -34,12 +34,12 @@ class ChapterController extends Controller
         $count = $table->count();
         //处理排序
         $table = $table->orderBy(
-            $request->get("order", 'paragraph'),
-            $request->get("dir", 'asc')
+            $request->input("order", 'paragraph'),
+            $request->input("dir", 'asc')
         );
         //处理分页
-        $table = $table->skip($request->get("offset", 0))
-            ->take($request->get("limit", 1000));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input("limit", 1000));
         $result = $table->get();
         return $this->ok([
             "rows" => ChapterResource::collection($result),

api-v12/app/Http/Controllers/ChapterIOController.php

@@ -16,25 +16,34 @@ class ChapterIOController extends Controller
     public function index(Request $request)
     {
         //
-        $table = ProgressChapter::select(['uid','book','para',
-                                    'channel_id','progress','lang',
-                                    'title','summary','updated_at','created_at']);
-        switch ($request->get('view')) {
+        $table = ProgressChapter::select([
+            'uid',
+            'book',
+            'para',
+            'channel_id',
+            'progress',
+            'lang',
+            'title',
+            'summary',
+            'updated_at',
+            'created_at'
+        ]);
+        switch ($request->input('view')) {
             case 'public':
-                $channels = Channel::where('status',30)->select('uid')->get();
-                $table->whereIn('channel_id',$channels)
-                      ->where('updated_at','>',$request->get('updated_at','2000-1-1'));
-            break;
+                $channels = Channel::where('status', 30)->select('uid')->get();
+                $table->whereIn('channel_id', $channels)
+                    ->where('updated_at', '>', $request->input('updated_at', '2000-1-1'));
+                break;
         }
         $count = $table->count();
         //处理排序
-        $table->orderBy('updated_at','asc');
+        $table->orderBy('updated_at', 'asc');
         //处理分页
-        $table->skip($request->get("offset",0))
-              ->take($request->get("limit",200));
+        $table->skip($request->input("offset", 0))
+            ->take($request->input("limit", 200));
         //获取数据
         $result = $table->get();
-        return $this->ok(["rows"=>$result,"count"=>$count]);
+        return $this->ok(["rows" => $result, "count" => $count]);
     }
 
     /**

api-v12/app/Http/Controllers/ChapterIndexController.php

@@ -16,29 +16,31 @@ class ChapterIndexController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'public':
-                $channels = Channel::where('status',30)->select('uid');
-                $table = ProgressChapter::whereIn('channel_id',$channels);
-            break;
+                $channels = Channel::where('status', 30)->select('uid');
+                $table = ProgressChapter::whereIn('channel_id', $channels);
+                break;
         }
-        if($request->has("updated_at")){
-            $table = $table->where('updated_at','>', $request->get("updated_at"));
+        if ($request->has("updated_at")) {
+            $table = $table->where('updated_at', '>', $request->input("updated_at"));
         }
-        if($request->has("created_at")){
-            $table = $table->where('created_at','>', $request->get("created_at"));
+        if ($request->has("created_at")) {
+            $table = $table->where('created_at', '>', $request->input("created_at"));
         }
         //获取记录总条数
         $count = $table->count();
         //处理排序
-        $table = $table->orderBy($request->get("order",'created_at'),
-                                 $request->get("dir",'desc'));
+        $table = $table->orderBy(
+            $request->input("order", 'created_at'),
+            $request->input("dir", 'desc')
+        );
         //处理分页
-        $table = $table->skip($request->get("offset",0))
-                       ->take($request->get("limit",200));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input("limit", 200));
         //获取数据
         $result = $table->get();
-        return $this->ok(["rows"=>$result,"count"=>$count]);
+        return $this->ok(["rows" => $result, "count" => $count]);
     }
 
     /**

api-v12/app/Http/Controllers/ChatController.php

@@ -26,7 +26,7 @@ class ChatController extends Controller
         $total = $query->count();
 
         $chats = $query->orderBy('updated_at', 'desc')
-            ->paginate($request->get('limit', 20));
+            ->paginate($request->input('limit', 20));
 
         return $this->ok([
             'rows' => ChatResource::collection($chats),

api-v12/app/Http/Controllers/ChatMessageController.php

@@ -20,11 +20,11 @@ class ChatMessageController extends Controller
     public function index(Request $request)
     {
         //
-        $query = ChatMessage::where('chat_id', $request->get('chat'));
+        $query = ChatMessage::where('chat_id', $request->input('chat'));
 
         $total = $query->count();
 
-        $messages = $query->orderBy('id')->paginate($request->get('limit', 500));
+        $messages = $query->orderBy('id')->paginate($request->input('limit', 500));
 
         return $this->ok([
             'data' => ChatMessageResource::collection($messages),

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

@@ -20,12 +20,12 @@ class CollectionController extends Controller
     public function index(Request $request)
     {
         try {
-            $table = match ($request->get('view')) {
+            $table = match ($request->input('view')) {
                 'studio_list' => $this->service->buildStudioListQuery(),
                 'studio'      => $this->buildStudioIndex($request),
                 'public'      => $this->service->buildPublicQuery(
                     $request->has('studio')
-                        ? StudioApi::getIdByName($request->get('studio'))
+                        ? StudioApi::getIdByName($request->input('studio'))
                         : null
                 ),
                 default       => throw new \InvalidArgumentException('无法识别的view参数'),
@@ -37,21 +37,21 @@ class CollectionController extends Controller
         }
 
         if ($request->filled('search')) {
-            $table = $table->where('title', 'like', '%' . $request->get('search') . '%');
+            $table = $table->where('title', 'like', '%' . $request->input('search') . '%');
         }
 
         $count = $table->count();
 
         if ($request->has('order') && $request->has('dir')) {
-            $table = $table->orderBy($request->get('order'), $request->get('dir'));
+            $table = $table->orderBy($request->input('order'), $request->input('dir'));
         } else {
-            $orderCol = $request->get('view') === 'studio_list' ? 'count' : 'updated_at';
+            $orderCol = $request->input('view') === 'studio_list' ? 'count' : 'updated_at';
             $table = $table->orderBy($orderCol, 'desc');
         }
 
         $result = $table
-            ->skip($request->get('offset', 0))
-            ->take($request->get('limit', 1000))
+            ->skip($request->input('offset', 0))
+            ->take($request->input('limit', 1000))
             ->get();
 
         return $this->ok([
@@ -68,7 +68,7 @@ class CollectionController extends Controller
             throw new \Illuminate\Auth\AuthenticationException(__('auth.failed'));
         }
 
-        $studioId = StudioApi::getIdByName($request->get('name'));
+        $studioId = StudioApi::getIdByName($request->input('name'));
         if ($user['user_uid'] !== $studioId) {
             throw new \Illuminate\Auth\AuthenticationException(__('auth.failed'));
         }
@@ -76,7 +76,7 @@ class CollectionController extends Controller
         return $this->service->buildStudioQuery(
             $user['user_uid'],
             $studioId,
-            $request->get('view2', 'my')
+            $request->input('view2', 'my')
         );
     }
 
@@ -98,19 +98,19 @@ class CollectionController extends Controller
             return $this->error(__('auth.failed'), 401, 401);
         }
 
-        if ($user['user_uid'] !== StudioApi::getIdByName($request->get('studio'))) {
+        if ($user['user_uid'] !== StudioApi::getIdByName($request->input('studio'))) {
             return $this->error(__('auth.failed'), 403, 403);
         }
 
-        if (Collection::where('title', $request->get('title'))->where('owner', $user['user_uid'])->exists()) {
+        if (Collection::where('title', $request->input('title'))->where('owner', $user['user_uid'])->exists()) {
             return $this->error(__('validation.exists'), 200, 200);
         }
 
         $newOne = new Collection;
         $newOne->id           = app('snowflake')->id();
         $newOne->uid          = Str::uuid();
-        $newOne->title        = $request->get('title');
-        $newOne->lang         = $request->get('lang');
+        $newOne->title        = $request->input('title');
+        $newOne->lang         = $request->input('lang');
         $newOne->article_list = '[]';
         $newOne->owner        = $user['user_uid'];
         $newOne->owner_id     = $user['user_id'];
@@ -167,16 +167,16 @@ class CollectionController extends Controller
             return $this->error(__('auth.failed'), 403, 403);
         }
 
-        $collection->title           = $request->get('title');
-        $collection->subtitle        = $request->get('subtitle');
-        $collection->summary         = $request->get('summary');
-        $collection->lang            = $request->get('lang');
-        $collection->status          = $request->get('status');
-        $collection->default_channel = $request->get('default_channel');
+        $collection->title           = $request->input('title');
+        $collection->subtitle        = $request->input('subtitle');
+        $collection->summary         = $request->input('summary');
+        $collection->lang            = $request->input('lang');
+        $collection->status          = $request->input('status');
+        $collection->default_channel = $request->input('default_channel');
         $collection->modify_time     = time() * 1000;
 
         if ($request->has('aritcle_list')) {
-            $collection->article_list = json_encode($request->get('aritcle_list'));
+            $collection->article_list = json_encode($request->input('aritcle_list'));
         }
 
         $collection->save();

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

@@ -29,13 +29,13 @@ class CommandController extends Controller
     {
         //
         $user = AuthApi::current($request);
-        if(!$user || $user['user_uid'] !== 'ba5463f3-72d1-4410-858e-eadd10884713'){
-            return $this->error(__('auth.failed'),403,403);
+        if (!$user || $user['user_uid'] !== 'ba5463f3-72d1-4410-858e-eadd10884713') {
+            return $this->error(__('auth.failed'), 403, 403);
         }
 
-        Mq::publish('task',[
-            'name'=>$request->get('name'),
-            'param'=>$request->get('param'),
+        Mq::publish('task', [
+            'name' => $request->input('name'),
+            'param' => $request->input('param'),
         ]);
         return $this->ok('ok');
     }

api-v12/app/Http/Controllers/CompoundController.php

@@ -21,7 +21,7 @@ class CompoundController extends Controller
         if (!$dict_id) {
             return $this->error('没有找到 robot_compound 字典');
         }
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'only-word':
                 $result = UserDict::where('dict_id', $dict_id)
                     ->groupBy('word')->select('word')->get();
@@ -55,9 +55,9 @@ class CompoundController extends Controller
         }
         //删除旧数据
         $del = UserDict::where('dict_id', $dict_id)
-            ->whereIn('word', $request->get('index'))
+            ->whereIn('word', $request->input('index'))
             ->delete();
-        foreach ($request->get('words') as $key => $word) {
+        foreach ($request->input('words') as $key => $word) {
             $new = new UserDict;
             $new->id = app('snowflake')->id();
             $new->word = $word['word'];
@@ -75,7 +75,7 @@ class CompoundController extends Controller
             $new->flag = 0; //标记为维护状态
             $new->save();
         }
-        return $this->ok(count($request->get('words')));
+        return $this->ok(count($request->input('words')));
     }
 
     /**

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

@@ -78,7 +78,7 @@ class CorpusController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'para':
                 return $this->showPara($request);
                 break;
@@ -171,7 +171,7 @@ class CorpusController extends Controller
         if ($user) {
             $this->userUuid = $user['user_uid'];
         }
-        $channels = \explode('_', $request->get('channels'));
+        $channels = \explode('_', $request->input('channels'));
 
         $this->result['uid'] = "";
         $this->result['title'] = "";
@@ -179,7 +179,7 @@ class CorpusController extends Controller
         $this->result['summary'] = "";
         $this->result['lang'] = "";
         $this->result['status'] = 30;
-        $this->result['content'] = $this->getSentTpl($id, $channels, $request->get('mode', 'edit'));
+        $this->result['content'] = $this->getSentTpl($id, $channels, $request->input('mode', 'edit'));
         return $this->ok($this->result);
     }
     /**
@@ -257,7 +257,7 @@ class CorpusController extends Controller
     public function showPara(Request $request)
     {
         if ($request->has('debug')) {
-            $this->debug = explode(',', $request->get('debug'));
+            $this->debug = explode(',', $request->input('debug'));
         }
         $user = AuthApi::current($request);
         if ($user) {
@@ -265,7 +265,7 @@ class CorpusController extends Controller
         }
         //
         $channels = [];
-        if ($request->get('mode') === 'edit') {
+        if ($request->input('mode') === 'edit') {
             //翻译模式加载json格式原文
             $channels[] = ChannelApi::getSysChannel('_System_Wbw_VRI_');
         } else {
@@ -274,19 +274,19 @@ class CorpusController extends Controller
         }
 
         if ($request->has('channels')) {
-            if (strpos($request->get('channels'), ',') === FALSE) {
-                $getChannel = explode('_', $request->get('channels'));
+            if (strpos($request->input('channels'), ',') === FALSE) {
+                $getChannel = explode('_', $request->input('channels'));
             } else {
-                $getChannel = explode(',', $request->get('channels'));
+                $getChannel = explode(',', $request->input('channels'));
             }
             $channels = array_merge($channels, $getChannel);
         }
-        $para = explode(",", $request->get('par'));
+        $para = explode(",", $request->input('par'));
 
         //段落所在章节
-        $parent = PaliText::where('book', $request->get('book'))
+        $parent = PaliText::where('book', $request->input('book'))
             ->where('paragraph', $para[0])->first();
-        $chapter = PaliText::where('book', $request->get('book'))
+        $chapter = PaliText::where('book', $request->input('book'))
             ->where('paragraph', $parent->parent)->first();
         if ($chapter) {
             if (empty($chapter->toc)) {
@@ -340,7 +340,7 @@ class CorpusController extends Controller
          * 获取句子数据
          */
         $record = Sentence::select($this->selectCol)
-            ->where('book_id', $request->get('book'))
+            ->where('book_id', $request->input('book'))
             ->whereIn('paragraph', $para)
             ->whereIn('channel_uid', $channels)
             ->orderBy('paragraph')
@@ -349,7 +349,7 @@ class CorpusController extends Controller
         if (count($record) === 0) {
             $this->result['content'] = "<span>No Data</span>";
         } else {
-            $this->result['content'] = $this->makeContent($record, $request->get('mode', 'read'), $indexChannel, $indexedHeading, false, true);
+            $this->result['content'] = $this->makeContent($record, $request->input('mode', 'read'), $indexChannel, $indexedHeading, false, true);
         }
 
         return $this->ok($this->result);
@@ -364,7 +364,7 @@ class CorpusController extends Controller
     public function showChapter(Request $request, string $id)
     {
         if ($request->has('debug')) {
-            $this->debug = explode(',', $request->get('debug'));
+            $this->debug = explode(',', $request->input('debug'));
         }
         $user = AuthApi::current($request);
         if ($user) {
@@ -374,10 +374,10 @@ class CorpusController extends Controller
         $sentId = \explode('-', $id);
         $channels = [];
         if ($request->has('channels')) {
-            if (strpos($request->get('channels'), ',') === FALSE) {
-                $_channels = explode('_', $request->get('channels'));
+            if (strpos($request->input('channels'), ',') === FALSE) {
+                $_channels = explode('_', $request->input('channels'));
             } else {
-                $_channels = explode(',', $request->get('channels'));
+                $_channels = explode(',', $request->input('channels'));
             }
             foreach ($_channels as $key => $channel) {
                 if (Str::isUuid($channel)) {
@@ -386,7 +386,7 @@ class CorpusController extends Controller
             }
         }
 
-        $mode = $request->get('mode', 'read');
+        $mode = $request->input('mode', 'read');
         if ($mode === 'read') {
             //阅读模式加载html格式原文
             $channelId = ChannelApi::getSysChannel('_System_Pali_VRI_');
@@ -502,8 +502,8 @@ class CorpusController extends Controller
             }
         }
 
-        $pFrom = $request->get('from', $paraFrom);
-        $pTo = $request->get('to', $paraTo);
+        $pFrom = $request->input('from', $paraFrom);
+        $pTo = $request->input('to', $paraTo);
         //根据句子的长度找到这次应该加载的段落
 
         $paliText = PaliText::select(['paragraph', 'lenght'])
@@ -540,8 +540,8 @@ class CorpusController extends Controller
             $this->result['from'] = $currTo + 1;
             $this->result['to'] = $pTo;
             $this->result['paraId'] = $id;
-            $this->result['channels'] = $request->get('channels');
-            $this->result['mode'] = $request->get('mode');
+            $this->result['channels'] = $request->input('channels');
+            $this->result['mode'] = $request->input('mode');
         }
 
         return $this->ok($this->result);

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

@@ -21,14 +21,26 @@ class CourseController extends Controller
     public function index(Request $request)
     {
         //
-		$result=false;
-		$indexCol = ['id','title','subtitle',
-                     'cover','content','content_type',
-                     'teacher','start_at','end_at',
-                     'sign_up_start_at','sign_up_end_at',
-                     'join','publicity','number',
-                     'updated_at','created_at'];
-		switch ($request->get('view')) {
+        $result = false;
+        $indexCol = [
+            'id',
+            'title',
+            'subtitle',
+            'cover',
+            'content',
+            'content_type',
+            'teacher',
+            'start_at',
+            'end_at',
+            'sign_up_start_at',
+            'sign_up_end_at',
+            'join',
+            'publicity',
+            'number',
+            'updated_at',
+            'created_at'
+        ];
+        switch ($request->input('view')) {
             case 'new':
                 //最新公开课程列表
                 $table = Course::where('publicity', 30);
@@ -41,7 +53,7 @@ class CourseController extends Controller
                  * 2. 课程开始时间比现在时间晚
                  */
                 $table = Course::where('publicity', 30)
-                            ->whereDate('start_at',">",date("Y-m-d",strtotime("today")));
+                    ->whereDate('start_at', ">", date("Y-m-d", strtotime("today")));
                 break;
             case 'close':
                 /**
@@ -51,32 +63,32 @@ class CourseController extends Controller
                  * 2. 课程开始时间比现在时间早
                  */
                 $table = Course::where('publicity', 30)
-                        ->whereDate('start_at',"<=",date("Y-m-d",strtotime("today")));
+                    ->whereDate('start_at', "<=", date("Y-m-d", strtotime("today")));
                 break;
             case 'create':
-	            # 获取 studio 建立的所有 course
+                # 获取 studio 建立的所有 course
                 $user = AuthApi::current($request);
-                if(!$user){
+                if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
                 //判断当前用户是否有指定的studio的权限
-                if($user['user_uid'] !== StudioApi::getIdByName($request->get('studio'))){
+                if ($user['user_uid'] !== StudioApi::getIdByName($request->input('studio'))) {
                     return $this->error(__('auth.failed'));
                 }
 
                 $table = Course::where('studio_id', $user["user_uid"]);
-				break;
+                break;
             case 'study':
                 $user = AuthApi::current($request);
-                if(!$user){
+                if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
                 //我学习的课程
-                $course = CourseMember::where('user_id',$user["user_uid"])
-                                      ->where('role','student')
-                                      ->where('is_current',true)
-                                      ->select('course_id')
-                                      ->get();
+                $course = CourseMember::where('user_id', $user["user_uid"])
+                    ->where('role', 'student')
+                    ->where('is_current', true)
+                    ->select('course_id')
+                    ->get();
                 $courseId = [];
                 foreach ($course as $key => $value) {
                     # code...
@@ -87,14 +99,14 @@ class CourseController extends Controller
             case 'teach':
                 //我任教的课程
                 $user = AuthApi::current($request);
-                if(!$user){
+                if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
-                $course = CourseMember::where('user_id',$user["user_uid"])
-                                    ->whereIn('role',['assistant','manager','teacher'])
-                                      ->where('is_current',true)
-                                      ->select('course_id')
-                                    ->get();
+                $course = CourseMember::where('user_id', $user["user_uid"])
+                    ->whereIn('role', ['assistant', 'manager', 'teacher'])
+                    ->where('is_current', true)
+                    ->select('course_id')
+                    ->get();
                 $courseId = [];
                 foreach ($course as $key => $value) {
                     # code...
@@ -104,44 +116,46 @@ class CourseController extends Controller
                 break;
         }
         $table = $table->select($indexCol);
-        if($request->has('search')){
-            $table = $table->where('title', 'like', $request->get('search')."%");
+        if ($request->has('search')) {
+            $table = $table->where('title', 'like', $request->input('search') . "%");
         }
         $count = $table->count();
-        $table = $table->orderBy($request->get('order','updated_at'),
-                                 $request->get('dir','desc'));
+        $table = $table->orderBy(
+            $request->input('order', 'updated_at'),
+            $request->input('dir', 'desc')
+        );
 
-        $table = $table->skip($request->get('offset',0))
-                       ->take($request->get('limit',1000));
+        $table = $table->skip($request->input('offset', 0))
+            ->take($request->input('limit', 1000));
 
         $result = $table->get();
 
-		return $this->ok(["rows"=>CourseResource::collection($result),"count"=>$count]);
-
+        return $this->ok(["rows" => CourseResource::collection($result), "count" => $count]);
     }
     /**
      * Display a listing of the resource.
      *
      * @return \Illuminate\Http\Response
      */
-    public function showMyCourseNumber(Request $request){
+    public function showMyCourseNumber(Request $request)
+    {
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
         //我建立的课程
         $create = Course::where('studio_id', $user["user_uid"])->count();
         //我学习的课程
-        $study = CourseMember::where('user_id',$user["user_uid"])
-                            ->where('role','student')
-                            ->where('is_current',true)
-                            ->count();
+        $study = CourseMember::where('user_id', $user["user_uid"])
+            ->where('role', 'student')
+            ->where('is_current', true)
+            ->count();
         //我任教的课程
-        $teach = CourseMember::where('user_id',$user["user_uid"])
-                            ->where('is_current',true)
-                            ->whereIn('role',['assistant','manager','teacher'])
-                            ->count();
-        return $this->ok(['create'=>$create,'teach'=>$teach,'study'=>$study]);
+        $teach = CourseMember::where('user_id', $user["user_uid"])
+            ->where('is_current', true)
+            ->whereIn('role', ['assistant', 'manager', 'teacher'])
+            ->count();
+        return $this->ok(['create' => $create, 'teach' => $teach, 'study' => $study]);
     }
     /**
      * Store a newly created resource in storage.
@@ -153,29 +167,30 @@ class CourseController extends Controller
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
         //判断当前用户是否有指定的studio的权限
-        $studio_id = StudioApi::getIdByName($request->get('studio'));
-        if($user['user_uid'] !== $studio_id){
+        $studio_id = StudioApi::getIdByName($request->input('studio'));
+        if ($user['user_uid'] !== $studio_id) {
             return $this->error(__('auth.failed'));
         }
         //查询是否重复
-        if(Course::where('title',$request->get('title'))
-                ->where('studio_id',$user['user_uid'])
-                ->exists()){
-            return $this->error(__('validation.exists',['name']));
+        if (Course::where('title', $request->input('title'))
+            ->where('studio_id', $user['user_uid'])
+            ->exists()
+        ) {
+            return $this->error(__('validation.exists', ['name']));
         }
 
         try {
             $course = new Course;
-            DB::transaction(function () use($course,$request,$studio_id,$user) {
+            DB::transaction(function () use ($course, $request, $studio_id, $user) {
                 $saveCourse = false;
                 $saveCourseMember = false;
 
                 $course->id = Str::uuid();
-                $course->title = $request->get('title');
+                $course->title = $request->input('title');
                 $course->studio_id = $studio_id;
                 $saveCourse = $course->save();
 
@@ -186,9 +201,8 @@ class CourseController extends Controller
                 $newMember->role = 'owner';
                 $saveCourseMember = $newMember->save();
             });
-
-        } catch(\Exception $e) {
-            return $this->error('course create fail',500,500);
+        } catch (\Exception $e) {
+            return $this->error('course create fail', 500, 500);
         }
 
         return $this->ok(new CourseResource($course));
@@ -204,17 +218,17 @@ class CourseController extends Controller
     {
         //
         return $this->ok(new CourseResource($course));
-
     }
 
-    private function userCanManage($courseId,$userUid){
-                    //判断是否是manager
-        $role = CourseMember::where('course_id',$courseId)
-                    ->where('is_current',true)
-                    ->where('user_id',$userUid)
-                    ->value('role');
-        $manager = ['owner','teacher','manager'];
-        if(in_array($role,$manager)){
+    private function userCanManage($courseId, $userUid)
+    {
+        //判断是否是manager
+        $role = CourseMember::where('course_id', $courseId)
+            ->where('is_current', true)
+            ->where('user_id', $userUid)
+            ->value('role');
+        $manager = ['owner', 'teacher', 'manager'];
+        if (in_array($role, $manager)) {
             return true;
         }
         return false;
@@ -231,39 +245,48 @@ class CourseController extends Controller
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
         //判断当前用户是否有指定的studio的权限
-        $canManage = $this->userCanManage($course->id,$user['user_uid']);
-        if(!$canManage){
-            return $this->error(__('auth.failed'),403,403);
+        $canManage = $this->userCanManage($course->id, $user['user_uid']);
+        if (!$canManage) {
+            return $this->error(__('auth.failed'), 403, 403);
         }
 
         //查询标题是否重复
-        if(Course::where('title',$request->get('title'))
-                ->where('studio_id',$user['user_uid'])
-                ->exists()){
-            if($course->title !== $request->get('title')){
-                return $this->error(__('validation.exists',['name']));
+        if (Course::where('title', $request->input('title'))
+            ->where('studio_id', $user['user_uid'])
+            ->exists()
+        ) {
+            if ($course->title !== $request->input('title')) {
+                return $this->error(__('validation.exists', ['name']));
             }
         }
-        $course->title = $request->get('title');
-        $course->subtitle = $request->get('subtitle');
-        $course->summary = $request->get('summary');
-        $course->number = $request->get('number',0);
-        if($request->has('cover')) {$course->cover = $request->get('cover');}
-        $course->content = $request->get('content');
-        $course->sign_up_message = $request->get('sign_up_message');
-        if($request->has('teacher_id')) {$course->teacher = $request->get('teacher_id');}
-        if($request->has('anthology_id')) {$course->anthology_id = $request->get('anthology_id');}
-        $course->channel_id = $request->get('channel_id');
-        if($request->has('publicity')) {$course->publicity = $request->get('publicity');}
-        $course->start_at = $request->get('start_at');
-        $course->end_at = $request->get('end_at');
-        $course->sign_up_start_at = $request->get('sign_up_start_at');
-        $course->sign_up_end_at = $request->get('sign_up_end_at');
-        $course->join = $request->get('join');
+        $course->title = $request->input('title');
+        $course->subtitle = $request->input('subtitle');
+        $course->summary = $request->input('summary');
+        $course->number = $request->input('number', 0);
+        if ($request->has('cover')) {
+            $course->cover = $request->input('cover');
+        }
+        $course->content = $request->input('content');
+        $course->sign_up_message = $request->input('sign_up_message');
+        if ($request->has('teacher_id')) {
+            $course->teacher = $request->input('teacher_id');
+        }
+        if ($request->has('anthology_id')) {
+            $course->anthology_id = $request->input('anthology_id');
+        }
+        $course->channel_id = $request->input('channel_id');
+        if ($request->has('publicity')) {
+            $course->publicity = $request->input('publicity');
+        }
+        $course->start_at = $request->input('start_at');
+        $course->end_at = $request->input('end_at');
+        $course->sign_up_start_at = $request->input('sign_up_start_at');
+        $course->sign_up_end_at = $request->input('sign_up_end_at');
+        $course->join = $request->input('join');
         $course->save();
         return $this->ok($course);
     }
@@ -274,21 +297,21 @@ class CourseController extends Controller
      * @param  \App\Models\Course  $course
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Request $request,Course $course)
+    public function destroy(Request $request, Course $course)
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
         //判断当前用户是否有指定的studio的权限
-        if($user['user_uid'] !== $course->studio_id){
+        if ($user['user_uid'] !== $course->studio_id) {
             return $this->error(__('auth.failed'));
         }
         $delete = 0;
-        DB::transaction(function() use($delete,$course){
+        DB::transaction(function () use ($delete, $course) {
             //删除group member
-            $memberDelete = CourseMember::where('course_id',$course->id)->delete();
+            $memberDelete = CourseMember::where('course_id', $course->id)->delete();
             $delete = $course->delete();
         });
 

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

@@ -25,72 +25,80 @@ class CourseMemberController extends Controller
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error(__('auth.failed',[403],403));
+        if (!$user) {
+            return $this->error(__('auth.failed', [403], 403));
         }
         //判断当前用户是否有指定的 course 的权限
-        $role = CourseMember::where('course_id', $request->get('id',$request->get('course')))
-                            ->where('user_id',$user['user_uid'])
-                            ->value('role');
-        if(empty($role)){
-            return $this->error(__('auth.failed',[403],403));
+        $role = CourseMember::where('course_id', $request->input('id', $request->input('course')))
+            ->where('user_id', $user['user_uid'])
+            ->value('role');
+        if (empty($role)) {
+            return $this->error(__('auth.failed', [403], 403));
         }
 
-        $result=false;
-		$indexCol = ['id','user_id','course_id',
-                    'channel_id','role','editor_uid',
-                    'updated_at','created_at'];
-		switch ($request->get('view')) {
+        $result = false;
+        $indexCol = [
+            'id',
+            'user_id',
+            'course_id',
+            'channel_id',
+            'role',
+            'editor_uid',
+            'updated_at',
+            'created_at'
+        ];
+        switch ($request->input('view')) {
             case 'course':
-	            # 获取 course 内所有 成员
-                $table = CourseMember::where('course_id', $request->get('id'))
-                                    ->where('is_current',true);
-				break;
+                # 获取 course 内所有 成员
+                $table = CourseMember::where('course_id', $request->input('id'))
+                    ->where('is_current', true);
+                break;
             case 'timeline':
                 /**
                  * 编辑时间线
                  */
-                $table = CourseMember::where('user_id',$request->get('userId'));
-                if($request->get('timeline','current')==='current'){
-                    $table = $table->where('course_id', $request->get('course'));
+                $table = CourseMember::where('user_id', $request->input('userId'));
+                if ($request->input('timeline', 'current') === 'current') {
+                    $table = $table->where('course_id', $request->input('course'));
                 }
 
                 break;
             default:
-                return $this->error('无法识别的参数view',400,400);
-            break;
+                return $this->error('无法识别的参数view', 400, 400);
+                break;
         }
-        if(!empty($request->get("role")) && $request->get("role") !=='all'){
-            $table = $table->where('role', $request->get("role"));
+        if (!empty($request->input("role")) && $request->input("role") !== 'all') {
+            $table = $table->where('role', $request->input("role"));
         }
-        if(!empty($request->get("status"))){
-            $table = $table->whereIn('status', explode(',',$request->get("status")) );
+        if (!empty($request->input("status"))) {
+            $table = $table->whereIn('status', explode(',', $request->input("status")));
         }
-        if(!empty($request->get("search"))){
-            $usersId = UserInfo::where('nickname','like', '%'.$request->get("search")."%")
-                            ->select('userid')
-                            ->get();
+        if (!empty($request->input("search"))) {
+            $usersId = UserInfo::where('nickname', 'like', '%' . $request->input("search") . "%")
+                ->select('userid')
+                ->get();
             $table = $table->whereIn('user_id', $usersId);
         }
 
         $count = $table->count();
 
-        $table = $table->orderBy($request->get('order','created_at'),
-                                $request->get('dir','asc'));
+        $table = $table->orderBy(
+            $request->input('order', 'created_at'),
+            $request->input('dir', 'asc')
+        );
 
-        $table = $table->skip($request->get('offset',0))
-              ->take($request->get('limit',1000));
+        $table = $table->skip($request->input('offset', 0))
+            ->take($request->input('limit', 1000));
 
         $result = $table->get();
 
         //获取当前用户角色
-        $role = CourseMember::where('course_id', $request->get('id'))
-                            ->where('user_id', $user['user_uid'])
-                            ->where('is_current',true)
-                            ->value('role');
-
-		return $this->ok(["rows"=>CourseMemberResource::collection($result),'role'=>$role,"count"=>$count]);
+        $role = CourseMember::where('course_id', $request->input('id'))
+            ->where('user_id', $user['user_uid'])
+            ->where('is_current', true)
+            ->value('role');
 
+        return $this->ok(["rows" => CourseMemberResource::collection($result), 'role' => $role, "count" => $count]);
     }
 
     /**
@@ -103,8 +111,8 @@ class CourseMemberController extends Controller
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error(__('auth.failed',[403],403));
+        if (!$user) {
+            return $this->error(__('auth.failed', [403], 403));
         }
         $validated = $request->validate([
             'user_id' => 'required',
@@ -113,23 +121,24 @@ class CourseMemberController extends Controller
             'status' => 'required',
         ]);
         //查找重复的
-        if($validated['status'] !== 'invited'){
-            if(CourseMember::where('course_id', $validated['course_id'])
-                        ->where('user_id',$validated['user_id'])
-                        ->exists()){
-                return $this->error('member exists',[200],200);
+        if ($validated['status'] !== 'invited') {
+            if (CourseMember::where('course_id', $validated['course_id'])
+                ->where('user_id', $validated['user_id'])
+                ->exists()
+            ) {
+                return $this->error('member exists', [200], 200);
             }
         }
 
-        if($validated['status'] === 'invited'){
+        if ($validated['status'] === 'invited') {
             $userId = $validated['user_id'];
-        }else{
+        } else {
             $userId = $user['user_uid'];
         }
 
-        CourseMember::where('course_id',$validated['course_id'])
-            ->where('user_id',$userId)
-            ->update(['is_current'=>false]);
+        CourseMember::where('course_id', $validated['course_id'])
+            ->where('user_id', $userId)
+            ->update(['is_current' => false]);
 
         $newMember = new CourseMember();
         $newMember->course_id = $validated['course_id'];
@@ -144,29 +153,30 @@ class CourseMemberController extends Controller
          * manual: progressing
          */
         $course  = Course::find($validated['course_id']);
-        if(!$course){
+        if (!$course) {
             return $this->error('invalid course');
         }
         switch ($course->join) {
             case 'open': //开放学习课程
-                if($validated['status']!=='joined' &&
-                    $validated['status']!=='invited'
-                    ){
-                    return $this->error('invalid course',[200],200);
-                    }
+                if (
+                    $validated['status'] !== 'joined' &&
+                    $validated['status'] !== 'invited'
+                ) {
+                    return $this->error('invalid course', [200], 200);
+                }
                 break;
             case 'manual': //人工审核课程
-                if($validated['status']!=='applied' &&
-                    $validated['status']!=='invited'
-                    ){
-                    return $this->error('invalid course',[200],200);
-                    }
+                if (
+                    $validated['status'] !== 'applied' &&
+                    $validated['status'] !== 'invited'
+                ) {
+                    return $this->error('invalid course', [200], 200);
+                }
                 break;
         }
         $newMember->save();
 
         return $this->ok(new CourseMemberResource($newMember));
-
     }
 
     /**
@@ -176,25 +186,25 @@ class CourseMemberController extends Controller
      * @param  string  $courseId
      * @return \Illuminate\Http\Response
      */
-    public function show(Request $request,string $courseId)
+    public function show(Request $request, string $courseId)
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
         $userId = $user['user_uid'];
-        if(!empty($request->get('user_uid'))){
-            $userId = $request->get('user_uid');
+        if (!empty($request->input('user_uid'))) {
+            $userId = $request->input('user_uid');
         }
-        $member = CourseMember::where('course_id',$courseId)
-                                ->where('user_id',$userId)
-                                ->where('is_current',true)
-                                ->first();
-        if($member){
+        $member = CourseMember::where('course_id', $courseId)
+            ->where('user_id', $userId)
+            ->where('is_current', true)
+            ->first();
+        if ($member) {
             return $this->ok(new CourseMemberResource($member));
-        }else{
-            return $this->error('no result',200,200);
+        } else {
+            return $this->error('no result', 200, 200);
         }
     }
 
@@ -213,7 +223,7 @@ class CourseMemberController extends Controller
          * 原有记录变为历史记录
          */
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
 
@@ -228,44 +238,41 @@ class CourseMemberController extends Controller
         $courseMember->is_current = false;
         $courseMember->save();
 
-        if($request->has('channel_id')) {
-            if($newMember->user_id !== $user['user_uid']){
+        if ($request->has('channel_id')) {
+            if ($newMember->user_id !== $user['user_uid']) {
                 return $this->error(__('auth.failed'));
             }
-            $newMember->channel_id = $request->get('channel_id');
+            $newMember->channel_id = $request->input('channel_id');
         }
-        if($request->has('status')) {
-            $newMember->status = $request->get('status');
+        if ($request->has('status')) {
+            $newMember->status = $request->input('status');
         }
         $newMember->save();
         return $this->ok(new CourseMemberResource($newMember));
-
     }
     public function set_channel(Request $request)
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
 
-        if($request->has('channel_id')) {
-            $courseMember = CourseMember::where('course_id',$request->get('course_id'))
-                                        ->where('user_id',$user['user_uid'])
-                                        ->where('is_current',true)
-                                        ->first();
-            if($courseMember){
-                $courseMember->channel_id = $request->get('channel_id');
+        if ($request->has('channel_id')) {
+            $courseMember = CourseMember::where('course_id', $request->input('course_id'))
+                ->where('user_id', $user['user_uid'])
+                ->where('is_current', true)
+                ->first();
+            if ($courseMember) {
+                $courseMember->channel_id = $request->input('channel_id');
                 $courseMember->save();
                 return $this->ok(new CourseMemberResource($courseMember));
-            }else{
+            } else {
                 return $this->error(__('auth.failed'));
             }
-        }else{
+        } else {
             return $this->error(__('auth.failed'));
         }
-
-
     }
 
     /**
@@ -275,25 +282,25 @@ class CourseMemberController extends Controller
      * @param  \App\Models\CourseMember  $courseMember
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Request $request,CourseMember $courseMember)
+    public function destroy(Request $request, CourseMember $courseMember)
     {
         //查看删除者有没有删除权限
         //查询删除者的权限
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
 
-        $isOwner = Course::where('id',$courseMember->course_id)->where('studio_id',$user["user_uid"])->exists();
-        if(!$isOwner){
-            $courseUser = CourseMember::where('course_id',$courseMember->course_id)
-                ->where('user_id',$user["user_uid"])
+        $isOwner = Course::where('id', $courseMember->course_id)->where('studio_id', $user["user_uid"])->exists();
+        if (!$isOwner) {
+            $courseUser = CourseMember::where('course_id', $courseMember->course_id)
+                ->where('user_id', $user["user_uid"])
                 ->select('role')->first();
             //open 课程 可以删除自己
 
-            if(!$courseUser){
+            if (!$courseUser) {
                 //被删除的不是自己
-                if($courseUser->role ==="student"){
+                if ($courseUser->role === "student") {
                     //普通成员没有删除权限
                     return $this->error(__('auth.failed'));
                 }
@@ -313,25 +320,26 @@ class CourseMemberController extends Controller
     public function curr(Request $request)
     {
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
-        $courseUser = CourseMember::where('course_id',$request->get("course_id"))
-                                ->where('user_id',$user["user_uid"])
-                                ->where('is_current',true)
-                                ->select(['role','channel_id'])->first();
-        if($courseUser){
+        $courseUser = CourseMember::where('course_id', $request->input("course_id"))
+            ->where('user_id', $user["user_uid"])
+            ->where('is_current', true)
+            ->select(['role', 'channel_id'])->first();
+        if ($courseUser) {
             return $this->ok($courseUser);
-        }else{
+        } else {
             return $this->error("not member");
         }
     }
 
-    public function export(Request $request){
+    public function export(Request $request)
+    {
 
-        $courseUser = CourseMember::where('course_id',$request->get("course_id"))
-                                    ->where('is_current',true)
-                                    ->get();
+        $courseUser = CourseMember::where('course_id', $request->input("course_id"))
+            ->where('is_current', true)
+            ->get();
 
         $spreadsheet = new Spreadsheet();
         $activeWorksheet = $spreadsheet->getActiveSheet();

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

@@ -49,11 +49,11 @@ class DhammaTermController extends Controller
             'updated_at'
         ];
 
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'create-by-channel':
                 # 新建术语时。根据术语所在channel 给出新建术语所需数据。如语言，备选意思等。
                 #获取channel信息
-                $currChannel = Channel::where('uid', $request->get('channel'))->first();
+                $currChannel = Channel::where('uid', $request->input('channel'))->first();
                 if (!$currChannel) {
                     return $this->error(__('auth.failed'));
                 }
@@ -63,7 +63,7 @@ class DhammaTermController extends Controller
                     ->select(['name', 'uid'])
                     ->get();
                 #获取全网意思列表
-                $meanings = DhammaTerm::where('word', $request->get('word'))
+                $meanings = DhammaTerm::where('word', $request->input('word'))
                     ->where('language', $currChannel->lang)
                     ->select(['meaning', 'other_meaning'])
                     ->get();
@@ -91,7 +91,7 @@ class DhammaTermController extends Controller
                     $meaningCount[] = ['meaning' => $key, 'count' => $value];
                 }
                 return $this->ok([
-                    "word" => $request->get('word'),
+                    "word" => $request->input('word'),
                     "meaningCount" => $meaningCount,
                     "studioChannels" => $studioChannels,
                     "language" => $currChannel->lang,
@@ -105,7 +105,7 @@ class DhammaTermController extends Controller
                     return $this->error(__('auth.failed'), [], 401);
                 }
                 //判断当前用户是否有指定的studio的权限
-                if ($user['user_uid'] !== StudioApi::getIdByName($request->get('name'))) {
+                if ($user['user_uid'] !== StudioApi::getIdByName($request->input('name'))) {
                     return $this->error(__('auth.failed'), [], 403);
                 }
                 $table = DhammaTerm::select($indexCol)
@@ -118,19 +118,19 @@ class DhammaTermController extends Controller
                     return $this->error(__('auth.failed'));
                 }
                 //判断当前用户是否有指定的 channel 的权限
-                $channel = Channel::find($request->get('id'));
+                $channel = Channel::find($request->input('id'));
                 if ($user['user_uid'] !== $channel->owner_uid) {
                     //看是否为协作
-                    $power = ShareApi::getResPower($user['user_uid'], $request->get('id'));
+                    $power = ShareApi::getResPower($user['user_uid'], $request->input('id'));
                     if ($power === 0) {
                         return $this->error(__('auth.failed'), [], 403);
                     }
                 }
                 $table = DhammaTerm::select($indexCol)
-                    ->where('channal', $request->get('id'));
+                    ->where('channal', $request->input('id'));
                 break;
             case 'show':
-                return $this->ok(DhammaTerm::find($request->get('id')));
+                return $this->ok(DhammaTerm::find($request->input('id')));
                 break;
             case 'user':
                 # code...
@@ -139,32 +139,32 @@ class DhammaTermController extends Controller
                     return $this->error(__('auth.failed'));
                 }
                 $userUid = $user['user_uid'];
-                $search = $request->get('search');
+                $search = $request->input('search');
                 $table = DhammaTerm::select($indexCol)
                     ->where('owner', $userUid);
                 break;
             case 'word':
                 $table = DhammaTerm::select($indexCol)
-                    ->whereIn('word', explode(',', $request->get("word")))
-                    ->orWhereIn('meaning', explode(',', $request->get("word")));
+                    ->whereIn('word', explode(',', $request->input("word")))
+                    ->orWhereIn('meaning', explode(',', $request->input("word")));
                 break;
             case 'tag':
                 $table = DhammaTerm::select($indexCol)
-                    ->whereIn('tag', explode(',', $request->get("tag")));
+                    ->whereIn('tag', explode(',', $request->input("tag")));
                 break;
             case 'hot-meaning':
                 $key = 'term/hot_meaning';
                 $value = Cache::get($key, function () use ($request) {
                     $hotMeaning = [];
                     $words = DhammaTerm::select('word')
-                        ->where('language', $request->get("language"))
+                        ->where('language', $request->input("language"))
                         ->groupby('word')
                         ->get();
 
                     foreach ($words as $key => $word) {
                         # code...
                         $result = DhammaTerm::select(DB::raw('count(*) as word_count, meaning'))
-                            ->where('language', $request->get("language"))
+                            ->where('language', $request->input("language"))
                             ->where('word', $word['word'])
                             ->groupby('meaning')
                             ->orderby('word_count', 'desc')
@@ -173,7 +173,7 @@ class DhammaTermController extends Controller
                             $hotMeaning[] = [
                                 'word' => $word['word'],
                                 'meaning' => $result['meaning'],
-                                'language' => $request->get("language"),
+                                'language' => $request->input("language"),
                                 'owner' => '',
                             ];
                         }
@@ -188,7 +188,7 @@ class DhammaTermController extends Controller
                 break;
         }
 
-        $search = $request->get('search');
+        $search = $request->input('search');
         if (!empty($search)) {
             $table = $table->where(function ($query) use ($search) {
                 $query->where('word', 'like', $search . "%")
@@ -197,9 +197,9 @@ class DhammaTermController extends Controller
             });
         }
         $count = $table->count();
-        $table = $table->orderBy($request->get('order', 'updated_at'), $request->get('dir', 'desc'));
-        $table = $table->skip($request->get("offset", 0))
-            ->take($request->get('limit', 1000));
+        $table = $table->orderBy($request->input('order', 'updated_at'), $request->input('dir', 'desc'));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 1000));
         $result = $table->get();
 
         return $this->ok(["rows" => TermResource::collection($result), "count" => $count]);
@@ -228,13 +228,13 @@ class DhammaTermController extends Controller
          * 一个channel下面word+tag+language 唯一
          */
         $table = DhammaTerm::where('owner', $user["user_uid"])
-            ->where('word', $request->get("word"))
-            ->where('tag', $request->get("tag"));
-        if (!empty($request->get("channel"))) {
-            $isDoesntExist = $table->where('channal', $request->get("channel"))
+            ->where('word', $request->input("word"))
+            ->where('tag', $request->input("tag"));
+        if (!empty($request->input("channel"))) {
+            $isDoesntExist = $table->where('channal', $request->input("channel"))
                 ->doesntExist();
         } else {
-            $isDoesntExist = $table->whereNull('channal')->where('language', $request->get("language"))
+            $isDoesntExist = $table->whereNull('channal')->where('language', $request->input("language"))
                 ->doesntExist();
         }
 
@@ -243,21 +243,21 @@ class DhammaTermController extends Controller
             $term = new DhammaTerm;
             $term->id = app('snowflake')->id();
             $term->guid = Str::uuid();
-            $term->word = $request->get("word");
-            $term->word_en = Tools::getWordEn($request->get("word"));
-            $term->meaning = $request->get("meaning");
-            $term->other_meaning = $request->get("other_meaning");
-            $term->note = $request->get("note");
-            $term->tag = $request->get("tag");
-            $term->channal = $request->get("channel");
-            $term->language = $request->get("language");
-            if (!empty($request->get("channel"))) {
-                $channelInfo = ChannelApi::getById($request->get("channel"));
+            $term->word = $request->input("word");
+            $term->word_en = Tools::getWordEn($request->input("word"));
+            $term->meaning = $request->input("meaning");
+            $term->other_meaning = $request->input("other_meaning");
+            $term->note = $request->input("note");
+            $term->tag = $request->input("tag");
+            $term->channal = $request->input("channel");
+            $term->language = $request->input("language");
+            if (!empty($request->input("channel"))) {
+                $channelInfo = ChannelApi::getById($request->input("channel"));
                 if (!$channelInfo) {
                     return $this->error("channel id failed");
                 } else {
                     //查看有没有channel权限
-                    $power = ShareApi::getResPower($user["user_uid"], $request->get("channel"), 2);
+                    $power = ShareApi::getResPower($user["user_uid"], $request->input("channel"), 2);
                     if ($power < 20) {
                         return $this->error(__('auth.failed'));
                     }
@@ -266,9 +266,9 @@ class DhammaTermController extends Controller
                 }
             } else {
                 if ($request->has("studioId")) {
-                    $studioId = $request->get("studioId");
+                    $studioId = $request->input("studioId");
                 } else if ($request->has("studioName")) {
-                    $studioId = StudioApi::getIdByName($request->get("studioName"));
+                    $studioId = StudioApi::getIdByName($request->input("studioName"));
                 }
                 if (Str::isUuid($studioId)) {
                     $term->owner = $studioId;
@@ -350,13 +350,13 @@ class DhammaTermController extends Controller
             }
         }
 
-        $dhammaTerm->word = $request->get("word");
-        $dhammaTerm->word_en = Tools::getWordEn($request->get("word"));
-        $dhammaTerm->meaning = $request->get("meaning");
-        $dhammaTerm->other_meaning = $request->get("other_meaning");
-        $dhammaTerm->note = $request->get("note");
-        $dhammaTerm->tag = $request->get("tag");
-        $dhammaTerm->language = $request->get("language");
+        $dhammaTerm->word = $request->input("word");
+        $dhammaTerm->word_en = Tools::getWordEn($request->input("word"));
+        $dhammaTerm->meaning = $request->input("meaning");
+        $dhammaTerm->other_meaning = $request->input("other_meaning");
+        $dhammaTerm->note = $request->input("note");
+        $dhammaTerm->tag = $request->input("tag");
+        $dhammaTerm->language = $request->input("language");
         $dhammaTerm->editor_id = $user["user_id"];
         $dhammaTerm->create_time = time() * 1000;
         $dhammaTerm->modify_time = time() * 1000;
@@ -384,7 +384,7 @@ class DhammaTermController extends Controller
         $count = 0;
         if ($request->has("uuid")) {
             //查看是否有删除权限
-            foreach ($request->get("id") as $key => $uuid) {
+            foreach ($request->input("id") as $key => $uuid) {
                 $term = DhammaTerm::find($uuid);
                 if ($term->owner !== $user['user_uid']) {
                     if (!empty($term->channal)) {
@@ -402,7 +402,7 @@ class DhammaTermController extends Controller
                 $this->deleteCache($term);
             }
         } else {
-            $arrId = json_decode($request->get("id"), true);
+            $arrId = json_decode($request->input("id"), true);
             foreach ($arrId as $key => $id) {
                 # code...
                 $term = DhammaTerm::where('id', $id)

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

@@ -35,8 +35,8 @@ class DictController extends Controller
         $words = [];
         $word_base = [];
         $searched = [];
-        $words[$request->get('word')] = [];
-        $userLang = $request->get('lang', "zh");
+        $words[$request->input('word')] = [];
+        $userLang = $request->input('lang', "zh");
 
         /**
          * 临时代码判断是否在缅汉字典群里面。在群里的用户可以产看缅汉字典pdf

api-v12/app/Http/Controllers/DictInfoController.php

@@ -16,9 +16,9 @@ class DictInfoController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'name':
-                $table = DictInfo::where('name',$request->get('name'));
+                $table = DictInfo::where('name', $request->input('name'));
                 break;
 
             default:
@@ -26,18 +26,20 @@ class DictInfoController extends Controller
                 break;
         }
 
-        $table = $table->orderBy($request->get('order','updated_at'),
-                                $request->get('dir','desc'));
+        $table = $table->orderBy(
+            $request->input('order', 'updated_at'),
+            $request->input('dir', 'desc')
+        );
 
-        $table = $table->skip($request->get('offset',0))
-                       ->take($request->get('limit',100));
+        $table = $table->skip($request->input('offset', 0))
+            ->take($request->input('limit', 100));
 
         $result = $table->get();
         $count = count($result);
         return $this->ok([
-                            "rows"=>DictInfoResource::collection($result),
-                            "count"=>$count
-                        ]);
+            "rows" => DictInfoResource::collection($result),
+            "count" => $count
+        ]);
     }
 
     /**

api-v12/app/Http/Controllers/DictMeaningController.php

@@ -51,8 +51,8 @@ class DictMeaningController extends Controller
     public function index(Request $request)
     {
         //
-        $words = explode("-", $request->get('word'));
-        $lang = $request->get('lang');
+        $words = explode("-", $request->input('word'));
+        $lang = $request->input('lang');
         $key = "dict_first_mean/";
         $meaning = [];
         foreach ($words as $key => $word) {

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

@@ -38,20 +38,20 @@ class DictPreferenceController extends Controller
                 'user_dicts.editor_id',
             ]);
         //处理搜索
-        if (!empty($request->get("keyword"))) {
-            $table = $table->where('word_indices.word', 'like', "%" . $request->get("keyword") . "%");
+        if (!empty($request->input("keyword"))) {
+            $table = $table->where('word_indices.word', 'like', "%" . $request->input("keyword") . "%");
         }
 
         //获取记录总条数
         $count = $table->count();
         //处理排序
         $table = $table->orderBy(
-            $request->get("order", 'word_indices.count'),
-            $request->get("dir", 'desc')
+            $request->input("order", 'word_indices.count'),
+            $request->input("dir", 'desc')
         );
         //处理分页
-        $table = $table->skip($request->get("offset", 0))
-            ->take($request->get("limit", 200));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input("limit", 200));
         //获取数据
         $result = $table->get();
         return $this->ok([

api-v12/app/Http/Controllers/DictVocabularyController.php

@@ -18,44 +18,43 @@ class DictVocabularyController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get("view")) {
+        switch ($request->input("view")) {
             case 'dict_name':
-                $id = DictInfo::where('name',$request->get("name"))->value('id');
-                if(!$id){
-                    return $this->error('name:'.$request->get("name").' can not found.',200,200);
+                $id = DictInfo::where('name', $request->input("name"))->value('id');
+                if (!$id) {
+                    return $this->error('name:' . $request->input("name") . ' can not found.', 200, 200);
                 }
-                $table = UserDict::where('dict_id',$id)
-                                ->groupBy('word')
-                                ->selectRaw('word,count(*)');
+                $table = UserDict::where('dict_id', $id)
+                    ->groupBy('word')
+                    ->selectRaw('word,count(*)');
                 break;
             case 'dict_short_name':
-                    $id = DictInfo::where('shortname',$request->get("name"))->value('id');
-                    if(!$id){
-                        return $this->error('name:'.$request->get("name").' can not found.',200,200);
-                    }
-                    $table = UserDict::where('dict_id',$id)
-                                    ->groupBy('word')
-                                    ->selectRaw('word,count(*)');
-                    break;
-
+                $id = DictInfo::where('shortname', $request->input("name"))->value('id');
+                if (!$id) {
+                    return $this->error('name:' . $request->input("name") . ' can not found.', 200, 200);
+                }
+                $table = UserDict::where('dict_id', $id)
+                    ->groupBy('word')
+                    ->selectRaw('word,count(*)');
+                break;
         }
-        if($request->get("stream") === 'true'){
+        if ($request->input("stream") === 'true') {
             return response()->streamDownload(function () use ($table) {
                 $result = $table->get();
                 echo json_encode($result);
-            },'dict.txt');
+            }, 'dict.txt');
         }
         $count = 2;
-        $table = $table->orderBy('word',$request->get('dir','asc'));
+        $table = $table->orderBy('word', $request->input('dir', 'asc'));
 
-        $table = $table->skip($request->get('offset',0))
-                       ->take($request->get('limit',1000));
+        $table = $table->skip($request->input('offset', 0))
+            ->take($request->input('limit', 1000));
 
         $result = $table->get();
         return $this->ok([
-                            "rows"=>DictVocabularyResource::collection($result),
-                            "count"=>$count
-                        ]);
+            "rows" => DictVocabularyResource::collection($result),
+            "count" => $count
+        ]);
     }
 
     /**

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

@@ -35,10 +35,10 @@ class DiscussionController extends Controller
         if ($user) {
             $userInfo = UserApi::getByUuid($user['user_uid']);
         }
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'question-by-topic':
-                $topic = Discussion::where('id', $request->get('id'));
-                $topic->where('status', $request->get('status', 'active'))
+                $topic = Discussion::where('id', $request->input('id'));
+                $topic->where('status', $request->input('status', 'active'))
                     ->select('res_id')->first();
                 if (!$topic) {
                     return $this->error("无效的id");
@@ -48,7 +48,7 @@ class DiscussionController extends Controller
                     ->where('status', 'active')->count();
                 $closeNumber = Discussion::where('res_id', $topic->res_id)
                     ->where('status', 'close')->count();
-                $table->where('status', $request->get('status', 'active'))
+                $table->where('status', $request->input('status', 'active'))
                     ->where('parent', null);
                 break;
             case 'question':
@@ -58,7 +58,7 @@ class DiscussionController extends Controller
                  * basic用户看到别人在别人channel发表的discussion
                  *
                  */
-                if (!$user && $request->get('type') === 'discussion') {
+                if (!$user && $request->input('type') === 'discussion') {
                     return $this->ok([
                         "rows" => [],
                         "count" => 0,
@@ -68,14 +68,14 @@ class DiscussionController extends Controller
                         'can_reply' => false,
                     ]);
                 }
-                $resType = $request->get('res_type');
+                $resType = $request->input('res_type');
                 if ($user) {
                     switch ($resType) {
                         case 'sentence':
                             # code...
                             break;
                         case 'wbw':
-                            $block_uid = Wbw::where('uid', $request->get('id'))->value('block_uid');
+                            $block_uid = Wbw::where('uid', $request->input('id'))->value('block_uid');
                             if ($block_uid) {
                                 $channelId = WbwBlock::where('uid', $block_uid)->value('channel_uid');
                                 if ($channelId) {
@@ -90,8 +90,8 @@ class DiscussionController extends Controller
                 }
 
 
-                $resId = [$request->get('id')];
-                if (!empty($request->get('course'))) {
+                $resId = [$request->input('id')];
+                if (!empty($request->input('course'))) {
                     //
                     /**
                      * 如果res id 是答案，获取学员提问
@@ -99,12 +99,12 @@ class DiscussionController extends Controller
                      */
                     //获取学员提问
                     //获取学员channel
-                    if ($request->get('show_student') === 'true') {
-                        $channelsId = CourseApi::getStudentChannels($request->get('course'));
+                    if ($request->input('show_student') === 'true') {
+                        $channelsId = CourseApi::getStudentChannels($request->input('course'));
                         switch ($resType) {
                             case 'wbw':
                                 //获取答案单词编号
-                                $wbwWord = Wbw::where('uid', $request->get('id'))
+                                $wbwWord = Wbw::where('uid', $request->input('id'))
                                     ->first();
                                 $wbwId = WbwSentenceController::getWbwIdByChannels(
                                     $channelsId,
@@ -120,10 +120,10 @@ class DiscussionController extends Controller
                     }
                 }
                 $table = Discussion::whereIn('res_id', $resId)
-                    ->where('type', $request->get('type', 'discussion'))
-                    ->where('status', $request->get('status', 'active'))
+                    ->where('type', $request->input('type', 'discussion'))
+                    ->where('status', $request->input('status', 'active'))
                     ->where('parent', null);
-                if ($request->get('type') === 'discussion') {
+                if ($request->input('type') === 'discussion') {
                     if (
                         isset($userInfo) &&
                         isset($userInfo['roles']) &&
@@ -137,18 +137,18 @@ class DiscussionController extends Controller
                 }
                 $activeNumber = Discussion::whereIn('res_id', $resId)
                     ->where('parent', null)
-                    ->where('type', $request->get('type', 'discussion'))
+                    ->where('type', $request->input('type', 'discussion'))
                     ->where('status', 'active')->count();
                 $closeNumber = Discussion::whereIn('res_id', $resId)
                     ->where('parent', null)
-                    ->where('type', $request->get('type', 'discussion'))
+                    ->where('type', $request->input('type', 'discussion'))
                     ->where('status', 'close')->count();
                 break;
             case 'answer':
-                $table = Discussion::where('parent', $request->get('id'));
-                $activeNumber = Discussion::where('parent', $request->get('id'))
+                $table = Discussion::where('parent', $request->input('id'));
+                $activeNumber = Discussion::where('parent', $request->input('id'))
                     ->where('status', 'active')->count();
-                $closeNumber = Discussion::where('parent', $request->get('id'))
+                $closeNumber = Discussion::where('parent', $request->input('id'))
                     ->where('status', 'close')->count();
                 break;
             case 'res_id':
@@ -156,9 +156,9 @@ class DiscussionController extends Controller
                  * 先获取顶级节点
                  * 需要确定用户身份，manager查看全部topic 普通用户只显示自己提交的topic
                  */
-                $roots = Discussion::where('res_id', $request->get('id'))
-                    ->where('type', $request->get('type', 'discussion'))
-                    ->whereIn('status', explode(',', $request->get('status', 'active')))
+                $roots = Discussion::where('res_id', $request->input('id'))
+                    ->where('type', $request->input('type', 'discussion'))
+                    ->whereIn('status', explode(',', $request->input('status', 'active')))
                     ->where('parent', null)
                     ->select('id')
                     ->get();
@@ -167,11 +167,11 @@ class DiscussionController extends Controller
                     $query->whereIn('id', $roots)
                         ->orWhereIn('parent', $roots);
                 });
-                $activeNumber = Discussion::where('res_id', $request->get('id'))
-                    ->where('type', $request->get('type', 'discussion'))
+                $activeNumber = Discussion::where('res_id', $request->input('id'))
+                    ->where('type', $request->input('type', 'discussion'))
                     ->where('status', 'active')->count();
-                $closeNumber = Discussion::where('res_id', $request->get('id'))
-                    ->where('type', $request->get('type', 'discussion'))
+                $closeNumber = Discussion::where('res_id', $request->input('id'))
+                    ->where('type', $request->input('type', 'discussion'))
                     ->where('status', 'close')->count();
                 break;
             case 'topic-by-user':
@@ -183,16 +183,16 @@ class DiscussionController extends Controller
                     return $this->error('', 403, 403);
                 }
                 $table = Discussion::where('editor_uid', $user['user_uid'])
-                    ->where('type', $request->get('type', 'discussion'))
-                    ->whereIn('status', explode(',', $request->get('status', 'active')))
+                    ->where('type', $request->input('type', 'discussion'))
+                    ->whereIn('status', explode(',', $request->input('status', 'active')))
                     ->where('parent', null);
                 $activeNumber = Discussion::where('editor_uid', $user['user_uid'])
                     ->where('parent', null)
-                    ->where('type', $request->get('type', 'discussion'))
+                    ->where('type', $request->input('type', 'discussion'))
                     ->where('status', 'active')->count();
                 $closeNumber = Discussion::where('editor_uid', $user['user_uid'])
                     ->where('parent', null)
-                    ->where('type', $request->get('type', 'discussion'))
+                    ->where('type', $request->input('type', 'discussion'))
                     ->where('status', 'close')->count();
                 break;
             case 'all':
@@ -208,9 +208,9 @@ class DiscussionController extends Controller
         }
         $count = $table->count();
 
-        $table = $table->orderBy($request->get('order', 'created_at'), $request->get('dir', 'desc'));
-        $table = $table->skip($request->get("offset", 0))
-            ->take($request->get('limit', 100));
+        $table = $table->orderBy($request->input('order', 'created_at'), $request->input('dir', 'desc'));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 100));
 
         $result = $table->get();
 
@@ -218,11 +218,11 @@ class DiscussionController extends Controller
         $can_reply = false;
         $user = AuthApi::current($request);
 
-        switch ($request->get('type', 'discussion')) {
+        switch ($request->input('type', 'discussion')) {
             case 'qa':
-                switch ($request->get('res_type')) {
+                switch ($request->input('res_type')) {
                     case 'article':
-                        if ($user && ArticleController::userCanEditId($user['user_uid'], $request->get('id'))) {
+                        if ($user && ArticleController::userCanEditId($user['user_uid'], $request->input('id'))) {
                             $can_create = true;
                             $can_reply = true;
                         }
@@ -230,11 +230,11 @@ class DiscussionController extends Controller
                 }
                 break;
             case 'help':
-                switch ($request->get('res_type')) {
+                switch ($request->input('res_type')) {
                     case 'article':
                         if ($user) {
                             $can_reply = true;
-                            if (ArticleController::userCanEditId($user['user_uid'], $request->get('id'))) {
+                            if (ArticleController::userCanEditId($user['user_uid'], $request->input('id'))) {
                                 $can_create = true;
                             }
                         }
@@ -262,7 +262,7 @@ class DiscussionController extends Controller
     public function discussion_tree(Request $request)
     {
         $output = [];
-        $sentences = $request->get("data");
+        $sentences = $request->input("data");
         foreach ($sentences as $key => $sentence) {
             # 先查句子信息
             $sentInfo = Sentence::where('book_id', $sentence['book'])
@@ -313,7 +313,7 @@ class DiscussionController extends Controller
 
         if ($request->has('parent')) {
             $rules = [];
-            $parentInfo = Discussion::find($request->get('parent'));
+            $parentInfo = Discussion::find($request->input('parent'));
             if (!$parentInfo) {
                 return $this->error('no record');
             }
@@ -332,15 +332,15 @@ class DiscussionController extends Controller
             $discussion->res_id = $parentInfo->res_id;
             $discussion->res_type = $parentInfo->res_type;
         } else {
-            $discussion->res_id = $request->get('res_id');
-            $discussion->res_type = $request->get('res_type');
+            $discussion->res_id = $request->input('res_id');
+            $discussion->res_type = $request->input('res_type');
         }
-        $discussion->type = $request->get('type', 'discussion');
-        $discussion->tpl_id = $request->get('tpl_id');
-        $discussion->title = $request->get('title', null);
-        $discussion->content = $request->get('content', null);
-        $discussion->content_type = $request->get('content_type', "markdown");
-        $discussion->parent = $request->get('parent', null);
+        $discussion->type = $request->input('type', 'discussion');
+        $discussion->tpl_id = $request->input('tpl_id');
+        $discussion->title = $request->input('title', null);
+        $discussion->content = $request->input('content', null);
+        $discussion->content_type = $request->input('content_type', "markdown");
+        $discussion->parent = $request->input('parent', null);
         $discussion->editor_uid = $user['user_uid'];
         $discussion->save();
         //更新parent children_count
@@ -348,7 +348,7 @@ class DiscussionController extends Controller
             $parentInfo->increment('children_count', 1);
             $parentInfo->save();
         }
-        if ($request->get('notification', true)) {
+        if ($request->input('notification', true)) {
             Mq::publish('discussion', new DiscussionResource($discussion));
         }
 
@@ -454,11 +454,11 @@ class DiscussionController extends Controller
             return $this->error(__('auth.failed'), [403], 403);
         }
 
-        $discussion->title = $request->get('title', null);
-        $discussion->content = $request->get('content', null);
-        $discussion->status = $request->get('status', 'active');
+        $discussion->title = $request->input('title', null);
+        $discussion->content = $request->input('content', null);
+        $discussion->status = $request->input('status', 'active');
         if ($request->has('type')) {
-            $discussion->type = $request->get('type');
+            $discussion->type = $request->input('type');
         }
         //$discussion->editor_uid = $user['user_uid'];
         $discussion->save();

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

@@ -64,67 +64,66 @@ class DiscussionCountController extends Controller
          * 4. 计算作业channel的结果
          */
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error('auth.failed',401,401);
+        if (!$user) {
+            return $this->error('auth.failed', 401, 401);
         }
         $studioIdForTag = $user["user_uid"];
-        if($request->has('course_id')){
+        if ($request->has('course_id')) {
             //判断我的角色
-            $my = CourseMember::where('user_id',$user["user_uid"])
-                                ->where('is_current',true)
-                                ->where('course_id',$request->get('course_id'))
-                                ->first();
-            if(!$my){
-                return $this->error('auth.failed',403,403);
+            $my = CourseMember::where('user_id', $user["user_uid"])
+                ->where('is_current', true)
+                ->where('course_id', $request->input('course_id'))
+                ->first();
+            if (!$my) {
+                return $this->error('auth.failed', 403, 403);
             }
             //获取全部成员列表
-            $allMembers = CourseMember::where('is_current',true)
-                                ->where('course_id',$request->get('course_id'))
-                                ->select('user_id')
-                                ->get();
-            Log::debug('allMembers',['members'=>$allMembers]);
+            $allMembers = CourseMember::where('is_current', true)
+                ->where('course_id', $request->input('course_id'))
+                ->select('user_id')
+                ->get();
+            Log::debug('allMembers', ['members' => $allMembers]);
             //找到全部相关channel
             $channels = array();
             //获取答案 channel
-            $answerChannel = Course::where('id',$request->get('course_id'))
-                            ->value('channel_id');
-            $exerciseChannels = CourseMember::where('is_current',true)
-                                    ->where('course_id',$request->get('course_id'))
-                                    ->select('channel_id')
-                                    ->get();
-            if($answerChannel){
-                array_push($channels,$answerChannel);
+            $answerChannel = Course::where('id', $request->input('course_id'))
+                ->value('channel_id');
+            $exerciseChannels = CourseMember::where('is_current', true)
+                ->where('course_id', $request->input('course_id'))
+                ->select('channel_id')
+                ->get();
+            if ($answerChannel) {
+                array_push($channels, $answerChannel);
             }
             $users = array();
-            if($my->role === 'student'){
+            if ($my->role === 'student') {
                 //自己的channel + 答案
-                if($my->channel_id){
-                    array_push($channels,$my->channel_id);
+                if ($my->channel_id) {
+                    array_push($channels, $my->channel_id);
                 }
-            }else{
+            } else {
                 //找到全部学员channel + 答案
 
                 foreach ($exerciseChannels as $key => $value) {
-                    array_push($channels,$value->channel_id);
+                    array_push($channels, $value->channel_id);
                 }
                 //找到
-                $courseStudioId = Course::where('id',$request->get('course_id'))
-                            ->value('studio_id');
-                if($courseStudioId){
+                $courseStudioId = Course::where('id', $request->input('course_id'))
+                    ->value('studio_id');
+                if ($courseStudioId) {
                     $studioIdForTag = $courseStudioId;
                 }
-
             }
         }
 
         //获取全部资源列表
         $resId = array();
-        $querySentId = $request->get('sentences');
+        $querySentId = $request->input('sentences');
         //译文
         $table = Sentence::select('uid')
-                        ->whereIns(['book_id','paragraph','word_start','word_end'],$querySentId);
-        if(isset($channels)){
-            $table = $table->whereIn('channel_uid',$channels);
+            ->whereIns(['book_id', 'paragraph', 'word_start', 'word_end'], $querySentId);
+        if (isset($channels)) {
+            $table = $table->whereIn('channel_uid', $channels);
         }
         $sentUid = $table->get();
 
@@ -134,49 +133,49 @@ class DiscussionCountController extends Controller
         //wbw
         $wbwBlockParagraphs = [];
         foreach ($querySentId as $key => $value) {
-            $wbwBlockParagraphs[] = [$value[0],$value[1]];
+            $wbwBlockParagraphs[] = [$value[0], $value[1]];
         }
         $table = WbwBlock::select('uid')
-                          ->whereIns(['book_id','paragraph'],$wbwBlockParagraphs);
-        if(isset($channels)){
-            $table = $table->whereIn('channel_uid',$channels);
+            ->whereIns(['book_id', 'paragraph'], $wbwBlockParagraphs);
+        if (isset($channels)) {
+            $table = $table->whereIn('channel_uid', $channels);
         }
         $wbwBlock = $table->get();
-        if($wbwBlock){
+        if ($wbwBlock) {
             //找到逐词解析数据
             foreach ($querySentId as $key => $value) {
-                $wbwData = Wbw::whereIn('block_uid',$wbwBlock)
-                                ->whereBetween('wid',[$value[2],$value[3]])
-                                ->select('uid')
-                                ->get();
+                $wbwData = Wbw::whereIn('block_uid', $wbwBlock)
+                    ->whereBetween('wid', [$value[2], $value[3]])
+                    ->select('uid')
+                    ->get();
                 foreach ($wbwData as $key => $value) {
                     $resId[] = $value->uid;
                 }
             }
         }
-        Log::debug('res id',['res'=>$resId]);
+        Log::debug('res id', ['res' => $resId]);
         //全部资源id获取完毕
         //获取discussion
-        $table = Discussion::select(['id','res_id','res_type','type','editor_uid'])
-                            ->where('status','active')
-                            ->whereNull('parent')
-                            ->whereIn('res_id',$resId);
-        if(isset($allMembers)){
-            $table = $table->whereIn('editor_uid',$allMembers);
+        $table = Discussion::select(['id', 'res_id', 'res_type', 'type', 'editor_uid'])
+            ->where('status', 'active')
+            ->whereNull('parent')
+            ->whereIn('res_id', $resId);
+        if (isset($allMembers)) {
+            $table = $table->whereIn('editor_uid', $allMembers);
         }
 
         $allDiscussions = $table->get();
         $discussions = DiscussionCountResource::collection($allDiscussions);
 
         //获取 tag
-        $tags = TagMap::select(['tag_maps.id','anchor_id','table_name','tag_id','editor_uid','tags.name','tags.color'])
-                            ->whereIn('anchor_id',$resId)
-                            ->where('owner_uid',$studioIdForTag)
-                            ->leftJoin('tags','tags.id', '=', 'tag_maps.tag_id')
-                            ->get();
-        Log::debug('response',['data'=>$discussions]);
+        $tags = TagMap::select(['tag_maps.id', 'anchor_id', 'table_name', 'tag_id', 'editor_uid', 'tags.name', 'tags.color'])
+            ->whereIn('anchor_id', $resId)
+            ->where('owner_uid', $studioIdForTag)
+            ->leftJoin('tags', 'tags.id', '=', 'tag_maps.tag_id')
+            ->get();
+        Log::debug('response', ['data' => $discussions]);
         return $this->ok([
-            'discussions'=>$discussions,
+            'discussions' => $discussions,
             'tags' => $tags,
         ]);
     }
@@ -190,22 +189,22 @@ class DiscussionCountController extends Controller
     public function show(string  $resId)
     {
         //
-        $allDiscussions = Discussion::where('status','active')
-                                    ->whereNull('parent')
-                                    ->where('res_id',$resId)
-                                    ->select(['id','res_id','res_type','type','editor_uid'])
-                                    ->get();
+        $allDiscussions = Discussion::where('status', 'active')
+            ->whereNull('parent')
+            ->where('res_id', $resId)
+            ->select(['id', 'res_id', 'res_type', 'type', 'editor_uid'])
+            ->get();
         $discussions = DiscussionCountResource::collection($allDiscussions);
 
         //获取 tag
-        $table = TagMap::select(['id','anchor_id','table_name','tag_id','editor_uid'])
-                       ->where('anchor_id',$resId);
+        $table = TagMap::select(['id', 'anchor_id', 'table_name', 'tag_id', 'editor_uid'])
+            ->where('anchor_id', $resId);
 
         $allTags = $table->get();
         $tags = TagMapResource::collection($allTags);
-        Log::debug('response',['discussions'=>$discussions]);
+        Log::debug('response', ['discussions' => $discussions]);
         return $this->ok([
-            'discussions'=>$discussions,
+            'discussions' => $discussions,
             'tags' => $tags,
         ]);
     }

api-v12/app/Http/Controllers/EmailCertificationController.php

@@ -32,25 +32,25 @@ class EmailCertificationController extends Controller
     public function store(Request $request)
     {
         //查询是否重复
-        if (UserInfo::where('email', $request->get('email'))->exists()) {
+        if (UserInfo::where('email', $request->input('email'))->exists()) {
             return $this->error('email.exists', 'err.email.exists', 200);
         }
         $sender = config("mint.admin.root_uuid");
 
         $uuid = Str::uuid();
         $invite = Invite::firstOrNew(
-            ['email' => $request->get('email')],
+            ['email' => $request->input('email')],
             ['id' => $uuid]
         );
         $invite->user_uid = $sender;
         $invite->status = 'invited';
         $invite->save();
 
-        Mail::to($request->get('email'))
+        Mail::to($request->input('email'))
             ->send(new EmailCertif(
                 $invite->id,
-                $request->get('subject', 'sign up wikipali'),
-                $request->get('lang'),
+                $request->input('subject', 'sign up wikipali'),
+                $request->input('lang'),
             ));
         if (Mail::failures()) {
             return $this->error('send email fail', '', 200);

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

@@ -24,15 +24,15 @@ class ExportController extends Controller
     {
         $queryId = Str::uuid();
         $token = AuthApi::getToken($request);
-        switch ($request->get('type', 'chapter')) {
+        switch ($request->input('type', 'chapter')) {
             case 'chapter':
                 $data = [
-                    'book' => $request->get('book'),
-                    'para' => $request->get('par'),
-                    'channel' => $request->get('channel'),
-                    'format' => $request->get('format'),
-                    'origin' => $request->get('origin'),
-                    'translation' => $request->get('translation'),
+                    'book' => $request->input('book'),
+                    'para' => $request->input('par'),
+                    'channel' => $request->input('channel'),
+                    'format' => $request->input('format'),
+                    'origin' => $request->input('origin'),
+                    'translation' => $request->input('translation'),
                     'queryId' => $queryId,
                 ];
                 if ($token) {
@@ -42,14 +42,14 @@ class ExportController extends Controller
                 break;
             case 'article':
                 $data = [
-                    'id' => $request->get('id'),
-                    'channel' => $request->get('channel'),
-                    'format' => $request->get('format'),
-                    'origin' => $request->get('origin'),
-                    'translation' => $request->get('translation'),
+                    'id' => $request->input('id'),
+                    'channel' => $request->input('channel'),
+                    'format' => $request->input('format'),
+                    'origin' => $request->input('origin'),
+                    'translation' => $request->input('translation'),
                     'queryId' => $queryId,
-                    'anthology' => $request->get('anthology'),
-                    'channel' => $request->get('channel'),
+                    'anthology' => $request->input('anthology'),
+                    'channel' => $request->input('channel'),
                 ];
                 if ($token) {
                     $data['token'] = $token;
@@ -57,7 +57,7 @@ class ExportController extends Controller
                 Mq::publish('export_article', $data);
                 break;
             default:
-                return $this->error('unknown type ' . $request->get('type'), 400, 400);
+                return $this->error('unknown type ' . $request->input('type'), 400, 400);
                 break;
         }
 

api-v12/app/Http/Controllers/ExportWbwController.php

@@ -17,83 +17,82 @@ class ExportWbwController extends Controller
     public function index(Request $request)
     {
         //
-        $sent = explode("\n",$request->get("sent"));
+        $sent = explode("\n", $request->input("sent"));
         $output = [];
         foreach ($sent as $key => $value) {
             # code...
             $sent = [];
             $value = trim($value);
-            $sentId = explode("-",$value);
+            $sentId = explode("-", $value);
             //先查wbw block 拿到block id
-            $block = WbwBlock::where('book_id',$sentId[0])
-                        ->where('paragraph',$sentId[1])
-                        ->select('uid')
-                        ->where('channel_uid',$request->get("channel"))->first();
-            if(!$block){
+            $block = WbwBlock::where('book_id', $sentId[0])
+                ->where('paragraph', $sentId[1])
+                ->select('uid')
+                ->where('channel_uid', $request->input("channel"))->first();
+            if (!$block) {
                 continue;
             }
-            $wbwdata = Wbw::where('book_id',$sentId[0])
-                        ->where('paragraph',$sentId[1])
-                        ->where('wid','>=',$sentId[2])
-                        ->where('wid','<=',$sentId[3])
-                        ->where('block_uid',$block->uid)
-                        ->get();
-            $sent['sid']=$value;
-            $sent['text'] = PaliSentence::where('book',$sentId[0])
-                                        ->where('paragraph',$sentId[1])
-                                        ->where('word_begin',$sentId[2])
-                                        ->where('word_end','<=',$sentId[3])
-                                        ->value('html');
-            $sent['data']=[];
+            $wbwdata = Wbw::where('book_id', $sentId[0])
+                ->where('paragraph', $sentId[1])
+                ->where('wid', '>=', $sentId[2])
+                ->where('wid', '<=', $sentId[3])
+                ->where('block_uid', $block->uid)
+                ->get();
+            $sent['sid'] = $value;
+            $sent['text'] = PaliSentence::where('book', $sentId[0])
+                ->where('paragraph', $sentId[1])
+                ->where('word_begin', $sentId[2])
+                ->where('word_end', '<=', $sentId[3])
+                ->value('html');
+            $sent['data'] = [];
             foreach ($wbwdata as  $wbw) {
                 # code...
-                $data = str_replace("&nbsp;",' ',$wbw->data);
-                $data = str_replace("<br>",' ',$data);
+                $data = str_replace("&nbsp;", ' ', $wbw->data);
+                $data = str_replace("<br>", ' ', $data);
 
                 $xmlString = "<root>" . $data . "</root>";
-                try{
+                try {
                     $xmlWord = simplexml_load_string($xmlString);
-                }catch(Exception $e){
+                } catch (Exception $e) {
                     continue;
                 }
 
                 $wordsList = $xmlWord->xpath('//word');
                 foreach ($wordsList as $word) {
                     $pali = $word->real->__toString();
-                    $case = explode("#",$word->case->__toString()) ;
-                    if(isset($case[0])){
+                    $case = explode("#", $word->case->__toString());
+                    if (isset($case[0])) {
                         $type = $case[0];
-                    }else{
+                    } else {
                         $type = "";
                     }
 
-                    if(isset($case[1])){
+                    if (isset($case[1])) {
                         $grammar = $case[1];
-                        $grammar = str_replace("null","",$grammar);
-                    }else{
+                        $grammar = str_replace("null", "", $grammar);
+                    } else {
                         $grammar = "";
                     }
 
                     $style = $word->style->__toString();
-                    $factormeaning = str_replace("
","",$word->om->__toString());
-                    $factormeaning = str_replace("↓↓","",$factormeaning);
-                    if($type !== '.ctl.' && $style !== 'note' && !empty($pali)){
-                        $sent['data'][]=[
-                            'pali'=>$word->real->__toString(),
-                            'mean' => str_replace("
","",$word->mean->__toString()),
-                            'type' => ltrim($type,'.'),
-                            'grammar' => ltrim(str_replace('$.',',',$grammar),'.') ,
+                    $factormeaning = str_replace("
", "", $word->om->__toString());
+                    $factormeaning = str_replace("↓↓", "", $factormeaning);
+                    if ($type !== '.ctl.' && $style !== 'note' && !empty($pali)) {
+                        $sent['data'][] = [
+                            'pali' => $word->real->__toString(),
+                            'mean' => str_replace("
", "", $word->mean->__toString()),
+                            'type' => ltrim($type, '.'),
+                            'grammar' => ltrim(str_replace('$.', ',', $grammar), '.'),
                             'parent' => $word->parent->__toString(),
                             'factors' => $word->org->__toString(),
                             'factormeaning' => $factormeaning
                         ];
                     }
-
                 }
             }
-            $output[]=$sent;
+            $output[] = $sent;
         }
-        return view('export_wbw',['sentences' => $output] );
+        return view('export_wbw', ['sentences' => $output]);
     }
 
     /**

api-v12/app/Http/Controllers/ForgotPasswordController.php

@@ -29,21 +29,21 @@ class ForgotPasswordController extends Controller
     public function store(Request $request)
     {
         //
-        $user = UserInfo::where('email',$request->get('email'))->first();
-        if(!$user){
-            return $this->error('no user',404,404);
+        $user = UserInfo::where('email', $request->input('email'))->first();
+        if (!$user) {
+            return $this->error('no user', 404, 404);
         }
         $resetToken = Str::uuid();
         $user->reset_password_token = $resetToken;
         $ok = $user->save();
-        if(!$ok){
-            return $this->error('fail on update reset_password_token',500,500);
+        if (!$ok) {
+            return $this->error('fail on update reset_password_token', 500, 500);
         }
 
-        Mail::to($request->get('email'))
-            ->send(new ForgotPassword($resetToken,$request->get('lang'),$request->get('dashboard')));
-        if(Mail::failures()){
-            return $this->error('send email fail',[],200);
+        Mail::to($request->input('email'))
+            ->send(new ForgotPassword($resetToken, $request->input('lang'), $request->input('dashboard')));
+        if (Mail::failures()) {
+            return $this->error('send email fail', [], 200);
         }
         return $this->ok('');
     }

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

@@ -25,7 +25,7 @@ class GroupController extends Controller
         //
         $result = false;
         $indexCol = ['uid', 'name', 'description', 'owner', 'updated_at', 'created_at'];
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'studio':
                 # 获取studio内所有group
                 $user = AuthApi::current($request);
@@ -33,13 +33,13 @@ class GroupController extends Controller
                     return $this->error(__('auth.failed'));
                 }
                 //判断当前用户是否有指定的studio的权限
-                $studioId = StudioApi::getIdByName($request->get('name'));
+                $studioId = StudioApi::getIdByName($request->input('name'));
                 if ($user['user_uid'] !== $studioId) {
                     return $this->error(__('auth.failed'));
                 }
 
                 $table = GroupInfo::select($indexCol);
-                if ($request->get('view2', 'my') === 'my') {
+                if ($request->input('view2', 'my') === 'my') {
                     $table = $table->where('owner', $studioId);
                 } else {
                     //我参加的group
@@ -56,20 +56,20 @@ class GroupController extends Controller
                 break;
         }
         if ($request->has("search")) {
-            $table = $table->where('name', 'like', "%" . $request->get("search") . "%");
+            $table = $table->where('name', 'like', "%" . $request->input("search") . "%");
         }
         $count = $table->count();
 
-        if ($request->get('view') === 'studio_list') {
+        if ($request->input('view') === 'studio_list') {
             $table = $table->orderBy('count', 'desc');
         } else {
             $table = $table->orderBy(
-                $request->get('order', 'updated_at'),
-                $request->get('dir', 'desc')
+                $request->input('order', 'updated_at'),
+                $request->input('dir', 'desc')
             );
         }
-        $table->skip($request->get('offset', 0))
-            ->take($request->get('limit', 1000));
+        $table->skip($request->input('offset', 0))
+            ->take($request->input('limit', 1000));
 
         $result = $table->get();
         if ($result) {
@@ -90,7 +90,7 @@ class GroupController extends Controller
             return $this->error(__('auth.failed'));
         }
         //判断当前用户是否有指定的studio的权限
-        $studioId = StudioApi::getIdByName($request->get('studio'));
+        $studioId = StudioApi::getIdByName($request->input('studio'));
         if ($user['user_uid'] !== $studioId) {
             return $this->error(__('auth.failed'));
         }
@@ -115,19 +115,19 @@ class GroupController extends Controller
             return $this->error(__('auth.failed'));
         }
         //判断当前用户是否有指定的studio的权限
-        if ($user['user_uid'] !== StudioApi::getIdByName($request->get('studio_name'))) {
+        if ($user['user_uid'] !== StudioApi::getIdByName($request->input('studio_name'))) {
             return $this->error(__('auth.failed'));
         }
         //查询是否重复
-        if (GroupInfo::where('name', $request->get('name'))->where('owner', $user['user_uid'])->exists()) {
+        if (GroupInfo::where('name', $request->input('name'))->where('owner', $user['user_uid'])->exists()) {
             return $this->error(__('validation.exists', ['name']));
         }
-        $studioId = StudioApi::getIdByName($request->get('studio_name'));
+        $studioId = StudioApi::getIdByName($request->input('studio_name'));
         $group = new GroupInfo;
         DB::transaction(function () use ($group, $request, $user, $studioId) {
             $group->id = app('snowflake')->id();
             $group->uid = Str::uuid();
-            $group->name = $request->get('name');
+            $group->name = $request->input('name');
             $group->owner = $studioId;
             $group->create_time = time() * 1000;
             $group->modify_time = time() * 1000;
@@ -138,7 +138,7 @@ class GroupController extends Controller
             $newMember->user_id = $studioId;
             $newMember->group_id = $group->uid;
             $newMember->power = 0;
-            $newMember->group_name = $request->get('name');
+            $newMember->group_name = $request->input('name');
             $newMember->save();
         });
 
@@ -199,10 +199,10 @@ class GroupController extends Controller
         if ($user['user_uid'] !== $group->owner) {
             return $this->error(__('auth.failed'));
         }
-        $group->name = $request->get('name');
-        $group->description = $request->get('description');
+        $group->name = $request->input('name');
+        $group->description = $request->input('description');
         if ($request->has('status')) {
-            $group->status = $request->get('status');
+            $group->status = $request->input('status');
         }
         $group->create_time = time() * 1000;
         $group->modify_time = time() * 1000;

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

@@ -24,17 +24,17 @@ class GroupMemberController extends Controller
         }
         $result = false;
         $indexCol = ['id', 'user_id', 'group_id', 'power', 'level', 'status', 'updated_at', 'created_at'];
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'group':
                 # 获取 group 内所有 成员
                 //判断当前用户是否有指定的 group 的权限
-                if (GroupMember::where('group_id', $request->get('id'))
+                if (GroupMember::where('group_id', $request->input('id'))
                     ->where('user_id', $user['user_uid'])
                     ->exists()
                 ) {
-                    $table = GroupMember::where('group_id', $request->get('id'));
+                    $table = GroupMember::where('group_id', $request->input('id'));
                     //当前用户角色
-                    $power = GroupMember::where('group_id', $request->get('id'))
+                    $power = GroupMember::where('group_id', $request->input('id'))
                         ->where('user_id', $user['user_uid'])
                         ->value('power');
                     $roles = ["owner", "manager", "member"];
@@ -57,8 +57,8 @@ class GroupMemberController extends Controller
             $table = $table->orderBy('created_at');
         }
 
-        $table->skip($request->get('offset', 0))
-            ->take($request->get('limit', 1000));
+        $table->skip($request->input('offset', 0))
+            ->take($request->input('limit', 1000));
 
         $result = $table->get();
 

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

@@ -40,36 +40,36 @@ class InteractiveController extends Controller
         //
         $user = AuthApi::current($request);
         $data = [];
-        switch ($request->get('res_type')) {
+        switch ($request->input('res_type')) {
             case 'article':
                 /* qa */
                 $data['qa'] = [
                     'can_create' => false,
                     'can_reply' => false,
                 ];
-                if($user && ArticleController::userCanEditId($user['user_uid'],$res_id)){
+                if ($user && ArticleController::userCanEditId($user['user_uid'], $res_id)) {
                     $data['qa']['can_create'] = true;
                     $data['qa']['can_reply'] = true;
                 }
-                $data['qa']['count'] = Discussion::where('res_id',$res_id)
-                                                ->where('type','qa')
-                                                ->where('status','close')
-                                                ->count();
+                $data['qa']['count'] = Discussion::where('res_id', $res_id)
+                    ->where('type', 'qa')
+                    ->where('status', 'close')
+                    ->count();
                 /* help */
                 $data['help'] = [
                     'can_create' => false,
                     'can_reply' => false,
                 ];
-                if($user){
+                if ($user) {
                     $data['help']['can_reply'] = true;
-                    if(ArticleController::userCanEditId($user['user_uid'],$res_id)){
+                    if (ArticleController::userCanEditId($user['user_uid'], $res_id)) {
                         $data['help']['can_create'] = true;
                     }
                 }
-                $data['help']['count'] = Discussion::where('res_id',$res_id)
-                                                ->where('type','help')
-                                                ->where('status','active')
-                                                ->count();
+                $data['help']['count'] = Discussion::where('res_id', $res_id)
+                    ->where('type', 'help')
+                    ->where('status', 'active')
+                    ->count();
 
 
 
@@ -78,14 +78,14 @@ class InteractiveController extends Controller
                     'can_create' => false,
                     'can_reply' => false,
                 ];
-                if($user){
+                if ($user) {
                     $data['discussion']['can_reply'] = true;
                     $data['discussion']['can_create'] = true;
                 }
-                $data['discussion']['count'] = Discussion::where('res_id',$res_id)
-                                                ->where('type','discussion')
-                                                ->where('status','active')
-                                                ->count();
+                $data['discussion']['count'] = Discussion::where('res_id', $res_id)
+                    ->where('type', 'discussion')
+                    ->where('status', 'active')
+                    ->count();
                 break;
         }
 

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

@@ -35,13 +35,13 @@ class InviteController extends Controller
             'created_at',
             'updated_at'
         ]);
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'studio':
-                if (empty($request->get('studio'))) {
+                if (empty($request->input('studio'))) {
                     return $this->error(__('auth.failed'));
                 }
                 //判断当前用户是否有指定的studio的权限
-                if ($user['user_uid'] !== StudioApi::getIdByName($request->get('studio'))) {
+                if ($user['user_uid'] !== StudioApi::getIdByName($request->input('studio'))) {
                     return $this->error(__('auth.failed'));
                 }
                 $table = $table->where('user_uid', $user["user_uid"]);
@@ -54,16 +54,16 @@ class InviteController extends Controller
                 break;
         }
         if ($request->has('search')) {
-            $table = $table->where('email', 'like', '%' . $request->get('search') . "%");
+            $table = $table->where('email', 'like', '%' . $request->input('search') . "%");
         }
         $count = $table->count();
         $table = $table->orderBy(
-            $request->get('order', 'updated_at'),
-            $request->get('dir', 'desc')
+            $request->input('order', 'updated_at'),
+            $request->input('dir', 'desc')
         );
 
-        $table = $table->skip($request->get('offset', 0))
-            ->take($request->get('limit', 1000));
+        $table = $table->skip($request->input('offset', 0))
+            ->take($request->input('limit', 1000));
 
         $result = $table->get();
         return $this->ok(["rows" => InviteResource::collection($result), "count" => $count]);
@@ -79,13 +79,13 @@ class InviteController extends Controller
     {
         //
         $sender = '';
-        if (!empty($request->get('studio'))) {
+        if (!empty($request->input('studio'))) {
             $user = AuthApi::current($request);
             if (!$user) {
                 return $this->error(__('auth.failed'), 401, 401);
             }
             //判断当前用户是否有指定的studio的权限
-            $studio_id = StudioApi::getIdByName($request->get('studio'));
+            $studio_id = StudioApi::getIdByName($request->input('studio'));
             if ($user['user_uid'] !== $studio_id) {
                 return $this->error(__('auth.failed'));
             }
@@ -96,26 +96,26 @@ class InviteController extends Controller
 
         //查询是否重复
         if (
-            Invite::where('email', $request->get('email'))->exists() ||
-            UserInfo::where('email', $request->get('email'))->exists()
+            Invite::where('email', $request->input('email'))->exists() ||
+            UserInfo::where('email', $request->input('email'))->exists()
         ) {
             return $this->error('email.exists', __('validation.exists', ['email']), 200);
         }
 
         $uuid = Str::uuid();
-        Mail::to($request->get('email'))
+        Mail::to($request->input('email'))
             ->send(new InviteMail(
                 $uuid,
-                $request->get('subject', 'sign up wikipali'),
-                $request->get('lang'),
-                $request->get('dashboard')
+                $request->input('subject', 'sign up wikipali'),
+                $request->input('lang'),
+                $request->input('dashboard')
             ));
         if (Mail::failures()) {
             return $this->error('send email fail', '', 200);
         } else {
             $invite = new Invite;
             $invite->id = $uuid;
-            $invite->email = $request->get('email');
+            $invite->email = $request->input('email');
             $invite->user_uid = $sender;
             $invite->status = 'invited';
             $invite->save();

api-v12/app/Http/Controllers/Library/AnthologyController.php

@@ -20,8 +20,14 @@ class AnthologyController extends Controller
 
     // 作者色池：同上，根据 studio.id 首字节取余
     private array $authorColors = [
-        '#c8860a', '#2e7d32', '#1565c0', '#6a1b9a',
-        '#c62828', '#00695c', '#4e342e', '#37474f',
+        '#c8860a',
+        '#2e7d32',
+        '#1565c0',
+        '#6a1b9a',
+        '#c62828',
+        '#00695c',
+        '#4e342e',
+        '#37474f',
     ];
 
     public function __construct(private CollectionService $collectionService) {}
@@ -73,7 +79,7 @@ class AnthologyController extends Controller
             'cover_gradient' => $this->coverGradients[$colorIdx % count($this->coverGradients)],
             'author'         => $this->formatAuthor($item['studio'] ?? []),
             'chapters'       => $chapters,
-            'children_number'=> $item['childrenNumber'] ?? count($chapters),
+            'children_number' => $item['childrenNumber'] ?? count($chapters),
             'updated_at'     => isset($item['updated_at'])
                 ? \Carbon\Carbon::parse($item['updated_at'])->format('Y-m-d')
                 : '',
@@ -86,14 +92,14 @@ class AnthologyController extends Controller
     public function index(Request $request)
     {
         $perPage     = 10;
-        $currentPage = (int) $request->get('page', 1);
+        $currentPage = (int) $request->input('page', 1);
 
         $result = $this->collectionService->getPublicList($perPage, $currentPage);
 
         // $result['data'] 是 CollectionResource collection，转为数组逐条加工
         $items = collect($result['data'])
             ->values()
-            ->map(fn ($item, $i) => $this->formatForCard(
+            ->map(fn($item, $i) => $this->formatForCard(
                 is_array($item) ? $item : $item->toArray(request()),
                 $i
             ));
@@ -110,8 +116,8 @@ class AnthologyController extends Controller
 
         // 侧边栏作者列表：从当页数据聚合（如需完整列表可单独查询）
         $authors = $items
-            ->groupBy(fn ($i) => $i['author']['name'])
-            ->map(fn ($group, $name) => [
+            ->groupBy(fn($i) => $i['author']['name'])
+            ->map(fn($group, $name) => [
                 'name'     => $name,
                 'initials' => $group->first()['author']['initials'],
                 'color'    => $group->first()['author']['color'],
@@ -147,9 +153,9 @@ class AnthologyController extends Controller
 
         // 只保留 level=1 的顶级章节
         $articles = collect($raw['article_list'] ?? [])
-            ->filter(fn ($a) => ($a['level'] ?? 1) === 1)
+            ->filter(fn($a) => ($a['level'] ?? 1) === 1)
             ->values()
-            ->map(fn ($a, $i) => [
+            ->map(fn($a, $i) => [
                 'id'    => $a['article_id'],
                 'order' => $i + 1,
                 'title' => $a['title'],
@@ -184,19 +190,18 @@ class AnthologyController extends Controller
         // 相关文集：同作者其他文集
         $relatedResult = $this->collectionService->getPublicList(20, 1);
         $related = collect($relatedResult['data'])
-            ->map(fn ($item) => is_array($item) ? $item : $item->toArray(request()))
-            ->filter(fn ($item) =>
+            ->map(fn($item) => is_array($item) ? $item : $item->toArray(request()))
+            ->filter(
+                fn($item) =>
                 $item['uid'] !== $uid &&
-                ($item['studio']['id'] ?? '') === ($raw['studio']['id'] ?? '')
+                    ($item['studio']['id'] ?? '') === ($raw['studio']['id'] ?? '')
             )
             ->take(3)
-            ->map(fn ($item) => [
+            ->map(fn($item) => [
                 'id'             => $item['uid'],
                 'title'          => $item['title'],
                 'author_name'    => $item['studio']['nickName'] ?? $item['studio']['studioName'] ?? '',
-                'cover_gradient' => $this->coverGradients[
-                    $this->colorIndex($item['uid']) % count($this->coverGradients)
-                ],
+                'cover_gradient' => $this->coverGradients[$this->colorIndex($item['uid']) % count($this->coverGradients)],
             ])
             ->values();
 

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

@@ -19,21 +19,23 @@ class LikeController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get("view")) {
+        switch ($request->input("view")) {
             case 'count':
                 # code...
-                $result = Like::where("target_id",$request->get("target_id"))
-                                ->groupBy("type")
-                                ->select("type")
-                                ->selectRaw("count(*)")
-                                ->get();
+                $result = Like::where("target_id", $request->input("target_id"))
+                    ->groupBy("type")
+                    ->select("type")
+                    ->selectRaw("count(*)")
+                    ->get();
                 $user = AuthApi::current($request);
-                if($user){
+                if ($user) {
                     foreach ($result as $key => $value) {
-                        $curr = Like::where(["target_id"=>$request->get("target_id"),
-                                        'type'=>$value->type,
-                                        'user_id'=>$user["user_uid"]])->first();
-                        if($curr){
+                        $curr = Like::where([
+                            "target_id" => $request->input("target_id"),
+                            'type' => $value->type,
+                            'user_id' => $user["user_uid"]
+                        ])->first();
+                        if ($curr) {
                             $result[$key]->selected = true;
                             $result[$key]->my_id = $curr->id;
                         }
@@ -42,20 +44,20 @@ class LikeController extends Controller
                 return $this->ok($result);
                 break;
             case 'target':
-                $table = Like::where("target_id",$request->get("target_id"));
+                $table = Like::where("target_id", $request->input("target_id"));
                 break;
             default:
                 # code...
                 break;
         }
-        if($request->has("type")){
-            $table = $table->where('type',$request->get("type"));
+        if ($request->has("type")) {
+            $table = $table->where('type', $request->input("type"));
         }
         $count = $table->count();
         $result = $table->get();
         return $this->ok([
-            "rows"=>LikeResource::collection($result),
-            "count"=>$count
+            "rows" => LikeResource::collection($result),
+            "count" => $count
         ]);
     }
 
@@ -69,31 +71,33 @@ class LikeController extends Controller
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
         $param = $request->all();
-        $user_id = $request->get('user_id',$user["user_uid"]);
-        $like = Like::firstOrNew([
-            'type'=>$param['type'],
-            'target_id'=>$param['target_id'],
-            'target_type'=>$param['target_type'],
-            'user_id' =>  $user_id,
-        ],
-        [
-            'id'=>Str::uuid(),
-        ]);
+        $user_id = $request->input('user_id', $user["user_uid"]);
+        $like = Like::firstOrNew(
+            [
+                'type' => $param['type'],
+                'target_id' => $param['target_id'],
+                'target_type' => $param['target_type'],
+                'user_id' =>  $user_id,
+            ],
+            [
+                'id' => Str::uuid(),
+            ]
+        );
         $like->save();
         $output = [
-            'id'=>$like->id,
-            'type'=>$param['type'],
-            'target_id'=>$param['target_id'],
-            'target_type'=>$param['target_type'],
+            'id' => $like->id,
+            'type' => $param['type'],
+            'target_id' => $param['target_id'],
+            'target_type' => $param['target_type'],
             'user_id' => $user_id,
-            'count'=>Like::where('target_id',$param['target_id'])
-                        ->where('type',$param['type'])->count(),
-            'selected'=>true,
-            'my_id'=>$like->id,
+            'count' => Like::where('target_id', $param['target_id'])
+                ->where('type', $param['type'])->count(),
+            'selected' => true,
+            'my_id' => $like->id,
             'user' => UserApi::getByUuid($user_id),
         ];
         return $this->ok($output);
@@ -128,47 +132,47 @@ class LikeController extends Controller
      * @param  \App\Models\Like  $like
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Request $request,Like $like)
+    public function destroy(Request $request, Like $like)
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
-        if($like->user_id===$user["user_uid"]){
+        if ($like->user_id === $user["user_uid"]) {
             //移除自己
             $delete = $like->delete();
-            if($delete){
+            if ($delete) {
                 $output = [
-                    'type'=>$like['type'],
-                    'count'=>Like::where('target_id',$like['target_id'])
-                                ->where('type',$like['type'])->count(),
-                    'selected'=>false,
+                    'type' => $like['type'],
+                    'count' => Like::where('target_id', $like['target_id'])
+                        ->where('type', $like['type'])->count(),
+                    'selected' => false,
                 ];
                 return $this->ok($output);
-            }else{
-                $this->error('未知错误',200,200);
+            } else {
+                $this->error('未知错误', 200, 200);
             }
-
-        }else{
-            return $this->error(_('auth.failed'),403,403);
+        } else {
+            return $this->error(_('auth.failed'), 403, 403);
         }
     }
-    public function delete(Request $request){
-        if(!isset($_COOKIE["user_uid"])){
+    public function delete(Request $request)
+    {
+        if (!isset($_COOKIE["user_uid"])) {
             return $this->error("no login");
         }
         $param = [
-            "id"=>$request->get('id'),
-            'user_id'=>$_COOKIE["user_uid"]
+            "id" => $request->input('id'),
+            'user_id' => $_COOKIE["user_uid"]
         ];
         $del = Like::where($param)->delete();
-        $count = Like::where('target_id',$request->get('target_id'))
-                    ->where('type',$request->get('type'))
-                    ->count();
+        $count = Like::where('target_id', $request->input('target_id'))
+            ->where('type', $request->input('type'))
+            ->count();
         return $this->ok([
-            'deleted'=>$del,
-            'count'=>$count
-            ]);
+            'deleted' => $del,
+            'count' => $count
+        ]);
     }
 }

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

@@ -22,10 +22,10 @@ class ModelLogController extends Controller
         if (!$user) {
             return $this->error(__('auth.failed'));
         }
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'model':
                 # code..
-                $table = ModelLog::where('model_id', $request->get('id'));
+                $table = ModelLog::where('model_id', $request->input('id'));
                 break;
 
             default:
@@ -33,16 +33,16 @@ class ModelLogController extends Controller
                 break;
         }
         if ($request->has('search')) {
-            $table = $table->where('email', 'like', '%' . $request->get('search') . "%");
+            $table = $table->where('email', 'like', '%' . $request->input('search') . "%");
         }
         $count = $table->count();
         $table = $table->orderBy(
-            $request->get('order', 'updated_at'),
-            $request->get('dir', 'desc')
+            $request->input('order', 'updated_at'),
+            $request->input('dir', 'desc')
         );
 
-        $table = $table->skip($request->get('offset', 0))
-            ->take($request->get('limit', 20));
+        $table = $table->skip($request->input('offset', 0))
+            ->take($request->input('limit', 20));
 
         $result = $table->get();
         return $this->ok(["rows" => ModelLogResource::collection($result), "total" => $count]);
@@ -59,14 +59,14 @@ class ModelLogController extends Controller
         //
         $modelLog = new ModelLog();
         $modelLog->uid = Str::uuid();
-        $modelLog->model_id = $request->get('model_id');
-        $modelLog->request_at = $request->get('request_at');
-        $modelLog->request_headers = $request->get('request_headers');
-        $modelLog->request_data = $request->get('request_data');
-        $modelLog->response_headers = $request->get('response_headers');
-        $modelLog->response_data = $request->get('response_data');
-        $modelLog->status = $request->get('status');
-        $modelLog->success = $request->get('success', true);
+        $modelLog->model_id = $request->input('model_id');
+        $modelLog->request_at = $request->input('request_at');
+        $modelLog->request_headers = $request->input('request_headers');
+        $modelLog->request_data = $request->input('request_data');
+        $modelLog->response_headers = $request->input('response_headers');
+        $modelLog->response_data = $request->input('response_data');
+        $modelLog->status = $request->input('status');
+        $modelLog->success = $request->input('success', true);
         $modelLog->save();
         return $this->ok(new ModelLogResource($modelLog));
     }

api-v12/app/Http/Controllers/NissayaCardController.php

@@ -45,9 +45,9 @@ class NissayaCardController extends Controller
     {
         //
         $cardData = [];
-        App::setLocale($request->get('lang'));
+        App::setLocale($request->input('lang'));
         $localTerm = ChannelApi::getSysChannel(
-            "_System_Grammar_Term_" . strtolower($request->get('lang')) . "_",
+            "_System_Grammar_Term_" . strtolower($request->input('lang')) . "_",
             "_System_Grammar_Term_en_"
         );
         if (!$localTerm) {
@@ -166,7 +166,7 @@ class NissayaCardController extends Controller
                  */
                 $arrLocalEnding = array();
                 $localEndings = NissayaEnding::where('relation', $relation['name'])
-                    ->where('lang', $request->get('lang'))
+                    ->where('lang', $request->input('lang'))
                     ->get();
                 foreach ($localEndings as $localEnding) {
                     if (empty($localEnding->from) || $localEnding->from === $relation->from) {
@@ -186,7 +186,7 @@ class NissayaCardController extends Controller
             }
         }
 
-        if ($request->get('content_type', 'markdown') === 'markdown') {
+        if ($request->input('content_type', 'markdown') === 'markdown') {
             $m = new \Mustache_Engine(array('entity_flags' => ENT_QUOTES));
             $tpl = file_get_contents(resource_path("mustache/nissaya_ending_card.tpl"));
             $result = $m->render($tpl, $cardData);

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

@@ -38,33 +38,33 @@ class NissayaEndingController extends Controller
         ]);
 
         if (($request->has('case'))) {
-            $table->whereIn('case', explode(",", $request->get('case')));
+            $table->whereIn('case', explode(",", $request->input('case')));
         }
 
         if (($request->has('lang'))) {
-            $table->whereIn('lang', explode(",", $request->get('lang')));
+            $table->whereIn('lang', explode(",", $request->input('lang')));
         }
 
         if (($request->has('relation'))) {
-            $table->where('relation', $request->get('relation'));
+            $table->where('relation', $request->input('relation'));
         }
         if (($request->has('case'))) {
-            $table->where('case', $request->get('case'));
+            $table->where('case', $request->input('case'));
         }
 
         if (($request->has('search'))) {
-            $table->where('ending', 'like', "%" . $request->get('search') . "%");
+            $table->where('ending', 'like', "%" . $request->input('search') . "%");
         }
 
         $count = $table->count();
 
         $table->orderBy(
-            $request->get('order', 'updated_at'),
-            $request->get('dir', 'desc')
+            $request->input('order', 'updated_at'),
+            $request->input('dir', 'desc')
         );
 
-        $table->skip($request->get("offset", 0))
-            ->take($request->get('limit', 1000));
+        $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 1000));
         $result = $table->get();
 
         return $this->ok(["rows" => NissayaEndingResource::collection($result), "count" => $count]);
@@ -73,7 +73,7 @@ class NissayaEndingController extends Controller
     public function vocabulary(Request $request)
     {
         $result = NissayaEnding::select(['ending'])
-            ->where('lang', $request->get('lang'))
+            ->where('lang', $request->input('lang'))
             ->groupBy('ending')
             ->get();
         return $this->ok(["rows" => $result, "count" => count($result)]);
@@ -100,10 +100,10 @@ class NissayaEndingController extends Controller
         $new->ending = $validated['ending'];
         $new->strlen = mb_strlen($validated['ending'], "UTF-8");
         $new->lang = $validated['lang'];
-        $new->relation = $request->get('relation');
-        $new->case = $request->get('case');
+        $new->relation = $request->input('relation');
+        $new->case = $request->input('case');
         if ($request->has('from')) {
-            $new->from = json_encode($request->get('from'), JSON_UNESCAPED_UNICODE);
+            $new->from = json_encode($request->input('from'), JSON_UNESCAPED_UNICODE);
         } else {
             $new->from = null;
         }
@@ -140,26 +140,26 @@ class NissayaEndingController extends Controller
         }
         //查询是否重复
         /*
-        $table = NissayaEnding::where('ending',$request->get('ending'))
-                 ->where('lang',$request->get('lang'))
-                 ->where('relation',$request->get('relation'));
-        $from = json_encode($request->get('from'),JSON_UNESCAPED_UNICODE);
+        $table = NissayaEnding::where('ending',$request->input('ending'))
+                 ->where('lang',$request->input('lang'))
+                 ->where('relation',$request->input('relation'));
+        $from = json_encode($request->input('from'),JSON_UNESCAPED_UNICODE);
         if(empty($from)){
             $table = $table->whereNull('from');
         }else{
-            $json = $request->get('from');
+            $json = $request->input('from');
             $table = $table->whereJsonContains('from',['case'=>$json['case']]);
         }
         if($table->exists()){
             return $this->error(__('validation.exists',['name']));
         }
 */
-        $nissayaEnding->ending = $request->get('ending');
-        $nissayaEnding->strlen = mb_strlen($request->get('ending'), "UTF-8");
-        $nissayaEnding->lang = $request->get('lang');
-        $nissayaEnding->relation = $request->get('relation');
-        if ($request->has('from') && !empty($request->get('from'))) {
-            $nissayaEnding->from = json_encode($request->get('from'), JSON_UNESCAPED_UNICODE);
+        $nissayaEnding->ending = $request->input('ending');
+        $nissayaEnding->strlen = mb_strlen($request->input('ending'), "UTF-8");
+        $nissayaEnding->lang = $request->input('lang');
+        $nissayaEnding->relation = $request->input('relation');
+        if ($request->has('from') && !empty($request->input('from'))) {
+            $nissayaEnding->from = json_encode($request->input('from'), JSON_UNESCAPED_UNICODE);
         } else {
             $nissayaEnding->from = null;
         }
@@ -222,7 +222,7 @@ class NissayaEndingController extends Controller
             return $this->error(__('auth.failed'));
         }
 
-        $filename = $request->get('filename');
+        $filename = $request->input('filename');
         $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
         $reader->setReadDataOnly(true);
         $spreadsheet = $reader->load($filename);

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

@@ -24,7 +24,7 @@ class NotificationController extends Controller
             Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
         }
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'to':
                 $table = Notification::where('to', $user['user_uid']);
                 $unread = Notification::where('to', $user['user_uid'])
@@ -33,14 +33,14 @@ class NotificationController extends Controller
         }
 
         if ($request->has('status')) {
-            $table = $table->whereIn('status', explode(',', $request->get('status')));
+            $table = $table->whereIn('status', explode(',', $request->input('status')));
         }
         $count = $table->count();
 
-        $table = $table->orderBy($request->get('order', 'created_at'), $request->get('dir', 'desc'));
+        $table = $table->orderBy($request->input('order', 'created_at'), $request->input('dir', 'desc'));
 
-        $table = $table->skip($request->get("offset", 0))
-            ->take($request->get('limit', 10));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 10));
 
         $result = $table->get();
 
@@ -70,12 +70,12 @@ class NotificationController extends Controller
         $new = new Notification;
         $new->id = Str::uuid();
         $new->from = $user['user_uid'];
-        $new->to = $request->get('to');
-        $new->url = $request->get('url');
-        $new->content = $request->get('content');
-        $new->res_type = $request->get('res_type');
-        $new->res_id = $request->get('res_id');
-        $new->channel = $request->get('channel');
+        $new->to = $request->input('to');
+        $new->url = $request->input('url');
+        $new->content = $request->input('content');
+        $new->res_type = $request->input('res_type');
+        $new->res_id = $request->input('res_id');
+        $new->channel = $request->input('channel');
         $new->save();
 
         return $this->ok(new NotificationResource($new));
@@ -125,7 +125,7 @@ class NotificationController extends Controller
             return $this->error(__('auth.failed'), 401, 401);
         }
         if ($notification->to === $user['user_uid']) {
-            $notification->status = $request->get('status', 'read');
+            $notification->status = $request->input('status', 'read');
             $notification->save();
             $unread = Notification::where('to', $notification->to)
                 ->where('status', 'unread')

api-v12/app/Http/Controllers/OfflineIndexController.php

@@ -17,7 +17,7 @@ class OfflineIndexController extends Controller
     public function index(Request $request)
     {
         //
-        $index = app(PacketService::class)->index($request->get('file', null));
+        $index = app(PacketService::class)->index($request->input('file', null));
 
         return response()->json(
             $index,

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

@@ -22,13 +22,13 @@ class PaliTextController extends Controller
     {
         //
         $all_count = 0;
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'chapter-tag':
                 $tm = (new TagMap)->getTable();
                 $tg = (new Tag)->getTable();
                 $pt = (new PaliText)->getTable();
-                if ($request->get('tags') && $request->get('tags') !== '') {
-                    $tags = explode(',', $request->get('tags'));
+                if ($request->input('tags') && $request->input('tags') !== '') {
+                    $tags = explode(',', $request->input('tags'));
                     foreach ($tags as $tag) {
                         # code...
                         if (!empty($tag)) {
@@ -76,8 +76,8 @@ class PaliTextController extends Controller
                 break;
 
             case 'chapter':
-                if ($request->get('tags') && $request->get('tags') !== '') {
-                    $tags = explode(',', $request->get('tags'));
+                if ($request->input('tags') && $request->input('tags') !== '') {
+                    $tags = explode(',', $request->input('tags'));
                     foreach ($tags as $tag) {
                         # code...
                         if (!empty($tag)) {
@@ -125,19 +125,19 @@ class PaliTextController extends Controller
                 $all_count = count($chapters);
                 break;
             case 'chapter_children':
-                $table = PaliText::where('book', $request->get('book'))
-                    ->where('parent', $request->get('para'))
+                $table = PaliText::where('book', $request->input('book'))
+                    ->where('parent', $request->input('para'))
                     ->where('level', '<', 8);
                 $all_count = $table->count();
                 $chapters = $table->orderBy('paragraph')->get();
                 break;
             case 'children':
                 if ($request->has('id')) {
-                    $root = PaliText::where('uid', $request->get('id'))
+                    $root = PaliText::where('uid', $request->input('id'))
                         ->first();
                 } else {
-                    $root = PaliText::where('book', $request->get('book'))
-                        ->where('paragraph', $request->get('para'))
+                    $root = PaliText::where('book', $request->input('book'))
+                        ->where('paragraph', $request->input('para'))
                         ->first();
                 }
 
@@ -168,8 +168,8 @@ class PaliTextController extends Controller
                 $all_count = count($chapters);
                 break;
             case 'paragraph':
-                $result = PaliText::where('book', $request->get('book'))
-                    ->where('paragraph', $request->get('para'))
+                $result = PaliText::where('book', $request->input('book'))
+                    ->where('paragraph', $request->input('para'))
                     ->first();
                 if ($result) {
                     return $this->ok($result);
@@ -191,13 +191,13 @@ class PaliTextController extends Controller
                  */
 
                 if ($request->has('series')) {
-                    $book_title = $request->get('series');
+                    $book_title = $request->input('series');
                     //获取丛书书目列表
-                    $books = BookTitle::where('title', $request->get('series'))->get();
+                    $books = BookTitle::where('title', $request->input('series'))->get();
                 } else {
                     //查询这个目录的顶级目录
-                    $path = PaliText::where('book', $request->get('book'))
-                        ->where('paragraph', $request->get('para'))
+                    $path = PaliText::where('book', $request->input('book'))
+                        ->where('paragraph', $request->input('para'))
                         ->select('path')->first();
                     if (!$path) {
                         return $this->error("no data");
@@ -248,7 +248,7 @@ class PaliTextController extends Controller
                 break;
         }
 
-        if ($request->get('view') !== 'book-toc') {
+        if ($request->input('view') !== 'book-toc') {
             foreach ($chapters as $key => $value) {
                 if (is_object($value)) {
                     //TODO $value->book 可能不存在

api-v12/app/Http/Controllers/ParagraphContentController.php

@@ -29,7 +29,7 @@ class ParagraphContentController extends Controller
 
         $channels = [];
         if ($request->has('channels')) {
-            $_channels = explode(',', str_replace('_', ',', $request->get('channels')));
+            $_channels = explode(',', str_replace('_', ',', $request->input('channels')));
             foreach ($_channels as $key => $channel) {
                 if (Str::isUuid($channel)) {
                     $channels[] = $channel;
@@ -37,7 +37,7 @@ class ParagraphContentController extends Controller
             }
         }
 
-        $mode = $request->get('mode', 'read');
+        $mode = $request->input('mode', 'read');
         if ($mode === 'read') {
             //阅读模式加载html格式原文
             $channelId = ChannelApi::getSysChannel('_System_Pali_VRI_');

api-v12/app/Http/Controllers/PgPaliDictDownloadController.php

@@ -15,14 +15,14 @@ class PgPaliDictDownloadController extends Controller
      */
     public function index(Request $request)
     {
-        $currPage = $request->get('page',1);
+        $currPage = $request->input('page', 1);
         $path = 'export/fts/pali';
-        $filename = $path."/pali-{$currPage}.syn";
-        if(Redis::exists($filename)){
+        $filename = $path . "/pali-{$currPage}.syn";
+        if (Redis::exists($filename)) {
             $content = Redis::get($filename);
             return $this->ok($content);
-        }else{
-            return $this->error('no file',200,200);
+        } else {
+            return $this->error('no file', 200, 200);
         }
     }
 

api-v12/app/Http/Controllers/ProgressChapterController.php

@@ -25,38 +25,38 @@ class ProgressChapterController extends Controller
     public function index(Request $request)
     {
 
-        $minProgress = (float)$request->get('progress', 0.8);
+        $minProgress = (float)$request->input('progress', 0.8);
 
-        $offset = (int)$request->get('offset', 0);
+        $offset = (int)$request->input('offset', 0);
 
-        $limit = (int)$request->get('limit', 20);
+        $limit = (int)$request->input('limit', 20);
 
-        $channel_id = $request->get('channel');
+        $channel_id = $request->input('channel');
 
         //
 
         $chapters = false;
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'ids':
-                $aChannel = explode(',', $request->get('channel'));
+                $aChannel = explode(',', $request->input('channel'));
                 $chapters = ProgressChapter::select("channel_id")->selectRaw("uid as id")
                     ->with(['channel' => function ($query) {  //city对应上面province模型中定义的city方法名  闭包内是子查询
                         return $query->select('*');
                     }])
-                    ->where("book", $request->get('book'))
-                    ->where("para", $request->get('par'))
+                    ->where("book", $request->input('book'))
+                    ->where("para", $request->input('par'))
                     ->whereIn('channel_id', $aChannel)->get();
                 $all_count = count($chapters);
                 break;
             case 'studio':
                 #查询该studio的channel
-                $name = $request->get('name');
-                $studioId = StudioApi::getIdByName($request->get('name'));
+                $name = $request->input('name');
+                $studioId = StudioApi::getIdByName($request->input('name'));
                 if ($studioId === false) {
                     return $this->error('no user');
                 }
                 $table = Channel::where('owner_uid', $studioId);
-                if ($request->get('public') === "true") {
+                if ($request->input('public') === "true") {
                     $table = $table->where('status', 30);
                 }
                 $channels = $table->select('uid')->get();
@@ -67,8 +67,8 @@ class ProgressChapterController extends Controller
                     })
                     ->where('progress', '>', 0.85)
                     ->orderby('progress_chapters.created_at', 'desc')
-                    ->skip($request->get("offset", 0))
-                    ->take($request->get("limit", 1000))
+                    ->skip($request->input("offset", 0))
+                    ->take($request->input("limit", 1000))
                     ->get();
                 $all_count = ProgressChapter::whereIn('progress_chapters.channel_id', $channels)
                     ->where('progress', '>', 0.85)->count();
@@ -91,8 +91,8 @@ class ProgressChapterController extends Controller
                 }
                 break;
             case 'chapter-tag':
-                if ($request->get('tags') && $request->get('tags') !== '') {
-                    $tags = explode(',', $request->get('tags'));
+                if ($request->input('tags') && $request->input('tags') !== '') {
+                    $tags = explode(',', $request->input('tags'));
                     foreach ($tags as $tag) {
                         # code...
                         if (!empty($tag)) {
@@ -173,11 +173,11 @@ class ProgressChapterController extends Controller
                     ->leftJoin('channels', 'progress_chapters.channel_id', '=', 'channels.uid')
                     ->where("progress", ">", $minProgress)
                     ->where('channels.status', '>=', 30);
-                if (!empty($request->get('channel_type'))) {
-                    $chapters =  $chapters->where('channels.type', $request->get('channel_type'));
+                if (!empty($request->input('channel_type'))) {
+                    $chapters =  $chapters->where('channels.type', $request->input('channel_type'));
                 }
-                if (!empty($request->get('lang'))) {
-                    $chapters =  $chapters->where('progress_chapters.lang', $request->get('lang'));
+                if (!empty($request->input('lang'))) {
+                    $chapters =  $chapters->where('progress_chapters.lang', $request->input('lang'));
                 }
                 $chapters =  $chapters->groupBy('channel_id')
                     ->orderBy('count', 'desc')
@@ -204,8 +204,8 @@ class ProgressChapterController extends Controller
                     'progress_chapters.updated_at'
                 )
                     ->leftJoin('channels', 'progress_chapters.channel_id', '=', 'channels.uid')
-                    ->where("book", $request->get('book'))
-                    ->where("para", $request->get('par'))
+                    ->where("book", $request->input('book'))
+                    ->where("para", $request->input('par'))
                     ->orderBy('progress', 'desc')
                     ->get();
                 foreach ($chapters as $key => $value) {
@@ -246,8 +246,8 @@ class ProgressChapterController extends Controller
                 $pt = (new PaliText)->getTable();
 
                 //标签过滤
-                if ($request->has('tags') && !empty($request->get('tags'))) {
-                    $tags = explode(',', $request->get('tags'));
+                if ($request->has('tags') && !empty($request->input('tags'))) {
+                    $tags = explode(',', $request->input('tags'));
                     foreach ($tags as $tag) {
                         # code...
                         if (!empty($tag)) {
@@ -265,9 +265,9 @@ class ProgressChapterController extends Controller
                     $in1 = " ";
                 }
                 if ($request->has('studio')) {
-                    $studioId = StudioApi::getIdByName($request->get('studio'));
+                    $studioId = StudioApi::getIdByName($request->input('studio'));
                     $table = Channel::where('owner_uid', $studioId);
-                    if ($request->get('public') === "true") {
+                    if ($request->input('public') === "true") {
                         $table = $table->where('status', 30);
                     }
                     $channels = $table->select('uid')->get();
@@ -291,16 +291,16 @@ class ProgressChapterController extends Controller
                 $param[] = $minProgress;
 
                 //语言过滤
-                if (!empty($request->get('lang'))) {
+                if (!empty($request->input('lang'))) {
                     $whereLang = " and pc.lang = ? ";
-                    $param[] = $request->get('lang');
+                    $param[] = $request->input('lang');
                 } else {
                     $whereLang = "   ";
                 }
                 //channel type过滤
-                if ($request->has('channel_type') && !empty($request->get('channel_type'))) {
+                if ($request->has('channel_type') && !empty($request->input('channel_type'))) {
                     $channel_type = "and ch.type = ? ";
-                    $param[] = $request->get('channel_type');
+                    $param[] = $request->input('channel_type');
                 } else {
                     $channel_type = "";
                 }
@@ -381,13 +381,13 @@ class ProgressChapterController extends Controller
             case 'top':
                 break;
             case 'search':
-                $key = $request->get('key');
+                $key = $request->input('key');
                 $table = ProgressChapter::where('title', 'like', "%{$key}%");
                 //获取记录总条数
                 $all_count = $table->count();
                 //处理排序
                 if ($request->has("order") && $request->has("dir")) {
-                    $table = $table->orderBy($request->get("order"), $request->get("dir"));
+                    $table = $table->orderBy($request->input("order"), $request->input("dir"));
                 } else {
                     //默认排序
                     $table = $table->orderBy('updated_at', 'desc');
@@ -395,11 +395,11 @@ class ProgressChapterController extends Controller
                 //处理分页
                 if ($request->has("limit")) {
                     if ($request->has("offset")) {
-                        $offset = $request->get("offset");
+                        $offset = $request->input("offset");
                     } else {
                         $offset = 0;
                     }
-                    $table = $table->skip($offset)->take($request->get("limit"));
+                    $table = $table->skip($offset)->take($request->input("limit"));
                 }
                 //获取数据
                 $chapters = $table->get();

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

@@ -27,23 +27,23 @@ class ProjectController extends Controller
             return $this->error(__('auth.failed'), 401, 401);
         }
         if ($request->has('studio')) {
-            $studioId = StudioApi::getIdByName($request->get('studio'));
+            $studioId = StudioApi::getIdByName($request->input('studio'));
         } else {
             $studioId = $user['user_uid'];
         }
 
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'studio':
                 $table = Project::where('owner_id', $studioId)
                     ->whereNull('parent_id')
-                    ->where('type', $request->get('type', 'instance'));
+                    ->where('type', $request->input('type', 'instance'));
                 break;
             case 'project-tree':
-                $table = Project::where('uid', $request->get('project_id'))
-                    ->orWhereJsonContains('path', $request->get('project_id'));
+                $table = Project::where('uid', $request->input('project_id'))
+                    ->orWhereJsonContains('path', $request->input('project_id'));
                 break;
             case 'shared':
-                $type = $request->get('type', 'instance');
+                $type = $request->input('type', 'instance');
                 $resList = ShareApi::getResList($studioId, $type === 'instance' ? 7 : 6);
                 $resId = [];
                 foreach ($resList as $res) {
@@ -55,7 +55,7 @@ class ProjectController extends Controller
                 $table = Project::where('owner_id', '<>', $studioId)
                     ->whereNull('parent_id')
                     ->where('privacy', 'public')
-                    ->where('type', $request->get('type', 'instance'));
+                    ->where('type', $request->input('type', 'instance'));
                 break;
             default:
                 return $this->error('view', 200, 200);
@@ -63,20 +63,20 @@ class ProjectController extends Controller
         }
 
         if ($request->has('keyword')) {
-            $table = $table->where('title', 'like', '%' . $request->get('keyword') . '%');
+            $table = $table->where('title', 'like', '%' . $request->input('keyword') . '%');
         }
         if ($request->has('status')) {
-            $table = $table->whereIn('status', explode(',', $request->get('status')));
+            $table = $table->whereIn('status', explode(',', $request->input('status')));
         }
         $count = $table->count();
 
         $sql = $table->toSql();
         Log::debug('sql', ['sql' => $sql]);
 
-        $table = $table->orderBy($request->get('order', 'id'), $request->get('dir', 'asc'));
+        $table = $table->orderBy($request->input('order', 'id'), $request->input('dir', 'asc'));
 
-        $table = $table->skip($request->get("offset", 0))
-            ->take($request->get('limit', 10000));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 10000));
 
         $result = $table->get();
 
@@ -106,26 +106,26 @@ class ProjectController extends Controller
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
-        $studioId = StudioApi::getIdByName($request->get('studio_name'));
+        $studioId = StudioApi::getIdByName($request->input('studio_name'));
         if (!self::canEdit($user['user_uid'], $studioId)) {
             return $this->error(__('auth.failed'), 403, 403);
         }
-        $new = Project::firstOrNew(['uid' => $request->get('id')]);
-        if (Str::isUuid($request->get('id'))) {
-            $new->uid = $request->get('id');
+        $new = Project::firstOrNew(['uid' => $request->input('id')]);
+        if (Str::isUuid($request->input('id'))) {
+            $new->uid = $request->input('id');
         } else {
             $new->uid =  Str::uuid();
         }
-        $new->title = $request->get('title');
-        $new->description = $request->get('description');
-        $new->parent_id = $request->get('parent_id');
+        $new->title = $request->input('title');
+        $new->description = $request->input('description');
+        $new->parent_id = $request->input('parent_id');
         $new->editor_id = $user['user_uid'];
         $new->owner_id = $studioId;
-        $new->type = $request->get('type', 'instance');
+        $new->type = $request->input('type', 'instance');
 
 
-        if (Str::isUuid($request->get('parent_id'))) {
-            $parentPath = Project::where('uid', $request->get('parent_id'))->value('path');
+        if (Str::isUuid($request->input('parent_id'))) {
+            $parentPath = Project::where('uid', $request->input('parent_id'))->value('path');
             $parentPath = json_decode($parentPath);
             if (!is_array($parentPath)) {
                 $parentPath = array();
@@ -169,15 +169,15 @@ class ProjectController extends Controller
             return $this->error(__('auth.failed'), 403, 403);
         }
 
-        $project->title = $request->get('title');
-        $project->description = $request->get('description');
-        $project->parent_id = $request->get('parent_id');
+        $project->title = $request->input('title');
+        $project->description = $request->input('description');
+        $project->parent_id = $request->input('parent_id');
         $project->editor_id = $user['user_uid'];
-        $project->privacy = $request->get('privacy');
+        $project->privacy = $request->input('privacy');
 
 
-        if (Str::isUuid($request->get('parent_id'))) {
-            $parentPath = Project::where('uid', $request->get('parent_id'))->value('path');
+        if (Str::isUuid($request->input('parent_id'))) {
+            $parentPath = Project::where('uid', $request->input('parent_id'))->value('path');
             $parentPath = json_decode($parentPath);
             if (!is_array($parentPath)) {
                 $parentPath = array();

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

@@ -35,12 +35,12 @@ class ProjectTreeController extends Controller
             Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
         }
-        $studioId = StudioApi::getIdByName($request->get('studio_name'));
+        $studioId = StudioApi::getIdByName($request->input('studio_name'));
         if (!ProjectController::canEdit($user['user_uid'], $studioId)) {
             return $this->error(__('auth.failed'), 403, 403);
         }
         $newData = [];
-        foreach ($request->get('data') as $key => $value) {
+        foreach ($request->input('data') as $key => $value) {
             $data = [
                 'uid' => Str::uuid(),
                 'old_id' => $value['id'],
@@ -80,14 +80,14 @@ class ProjectTreeController extends Controller
                 } else {
                     $newData[$key]['parent_id'] = null;
                 }
-            } else if (!empty($request->get('parent_id'))) {
-                $pPath = Project::where('uid', $request->get('parent_id'))->value('path');
+            } else if (!empty($request->input('parent_id'))) {
+                $pPath = Project::where('uid', $request->input('parent_id'))->value('path');
                 $parentPath = json_decode($pPath);
                 if (!is_array($parentPath)) {
                     $parentPath = [];
                 }
-                $newData[$key]['path'] = json_encode([...$parentPath, $request->get('parent_id')], JSON_UNESCAPED_UNICODE);
-                $newData[$key]['parent_id'] = $request->get('parent_id');
+                $newData[$key]['path'] = json_encode([...$parentPath, $request->input('parent_id')], JSON_UNESCAPED_UNICODE);
+                $newData[$key]['parent_id'] = $request->input('parent_id');
             }
         }
         $output = [];

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

@@ -20,19 +20,19 @@ class RecentController extends Controller
         //
         switch ($request->view) {
             case 'user':
-                $table = Recent::where('user_uid', $request->get('id'));
+                $table = Recent::where('user_uid', $request->input('id'));
                 break;
             default:
                 return $this->error('known view');
                 break;
         }
         if ($request->has('type')) {
-            $table->where('type', $request->get('type'));
+            $table->where('type', $request->input('type'));
         }
-        $table->orderBy($request->get('order', 'updated_at'), $request->get('dir', 'desc'));
+        $table->orderBy($request->input('order', 'updated_at'), $request->input('dir', 'desc'));
         $count = $table->count();
-        $table->skip($request->get("offset", 0))
-            ->take($request->get('limit', 1000));
+        $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 1000));
 
         $result = $table->get();
         return $this->ok(["rows" => RecentResource::collection($result), "count" => $count]);
@@ -57,13 +57,13 @@ class RecentController extends Controller
         ]);
 
         $row = Recent::firstOrNew([
-            "type" => $request->get("type"),
-            "article_id" => $request->get("article_id"),
+            "type" => $request->input("type"),
+            "article_id" => $request->input("article_id"),
             "user_uid" => $user['user_uid'],
         ], [
             "id" => Str::uuid(),
         ]);
-        $row->param = $request->get("param", null);
+        $row->param = $request->input("param", null);
         $row->save();
         return $this->ok(new RecentResource($row));
     }

api-v12/app/Http/Controllers/RelatedParagraphController.php

@@ -28,6 +28,7 @@
  * 制作时包含全部段落。做好后把没有相关段落的段落删掉？？
  *
  */
+
 namespace App\Http\Controllers;
 
 use App\Models\RelatedParagraph;
@@ -44,26 +45,26 @@ class RelatedParagraphController extends Controller
     public function index(Request $request)
     {
         //
-        $first = RelatedParagraph::where('book',$request->get('book'))
-                                    ->where('para',$request->get('para'))
-                                    ->where('cs_para','>',0)
-                                    ->first();
-        $result = RelatedParagraph::where('book_name',$first->book_name)
-                                    ->where('cs_para',$first->cs_para)
-                                    ->orderBy('book_id')
-                                    ->orderBy('para')
-                                    ->get();
-        $books=[];
+        $first = RelatedParagraph::where('book', $request->input('book'))
+            ->where('para', $request->input('para'))
+            ->where('cs_para', '>', 0)
+            ->first();
+        $result = RelatedParagraph::where('book_name', $first->book_name)
+            ->where('cs_para', $first->cs_para)
+            ->orderBy('book_id')
+            ->orderBy('para')
+            ->get();
+        $books = [];
         foreach ($result as $value) {
             # 把段落整合成书。有几本书就有几条输出纪录
-            if(!isset($books[$value->book_id])){
+            if (!isset($books[$value->book_id])) {
                 $books[$value->book_id]['book'] = $value->book;
                 $books[$value->book_id]['book_id'] = $value->book_id;
                 $books[$value->book_id]['cs6_para'] = $value->cs_para;
             }
-            $books[$value->book_id]['para'][]=$value->para;
+            $books[$value->book_id]['para'][] = $value->para;
         }
-        return $this->ok(["rows"=>RelatedParagraphResource::collection($books),"count"=>count($books)]);
+        return $this->ok(["rows" => RelatedParagraphResource::collection($books), "count" => count($books)]);
     }
 
     /**

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

@@ -40,31 +40,31 @@ class RelationController extends Controller
             'created_at'
         ]);
         if (($request->has('case'))) {
-            $table = $table->whereIn('case', explode(",", $request->get('case')));
+            $table = $table->whereIn('case', explode(",", $request->input('case')));
         }
         if (($request->has('search'))) {
-            $table = $table->where('name', 'like', $request->get('search') . "%");
+            $table = $table->where('name', 'like', $request->input('search') . "%");
         }
         if (($request->has('name'))) {
-            $table = $table->where('name', $request->get('name'));
+            $table = $table->where('name', $request->input('name'));
         }
         if (($request->has('from'))) {
-            $table = $table->whereJsonContains('from->case', $request->get('from'));
+            $table = $table->whereJsonContains('from->case', $request->input('from'));
         }
         if (($request->has('to'))) {
-            $table = $table->whereJsonContains('to', $request->get('to'));
+            $table = $table->whereJsonContains('to', $request->input('to'));
         }
         if (($request->has('match'))) {
-            $table = $table->whereJsonContains('match', $request->get('match'));
+            $table = $table->whereJsonContains('match', $request->input('match'));
         }
         if (($request->has('category'))) {
-            $table = $table->where('category', $request->get('category'));
+            $table = $table->where('category', $request->input('category'));
         }
-        $table = $table->orderBy($request->get('order', 'updated_at'), $request->get('dir', 'desc'));
+        $table = $table->orderBy($request->input('order', 'updated_at'), $request->input('dir', 'desc'));
         $count = $table->count();
 
-        $table = $table->skip($request->get("offset", 0))
-            ->take($request->get('limit', 1000));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 1000));
         $result = $table->get();
 
         $output = ["rows" => RelationResource::collection($result), "count" => $count];
@@ -95,25 +95,25 @@ class RelationController extends Controller
         $validated = $request->validate([
             'name' => 'required',
         ]);
-        $case = $request->get('case', '');
+        $case = $request->input('case', '');
         $new = new Relation;
         $new->name = $validated['name'];
 
-        $new->case = $request->get('case');
-        $new->category = $request->get('category');
+        $new->case = $request->input('case');
+        $new->category = $request->input('category');
 
         if ($request->has('from')) {
-            $new->from = json_encode($request->get('from'), JSON_UNESCAPED_UNICODE);
+            $new->from = json_encode($request->input('from'), JSON_UNESCAPED_UNICODE);
         } else {
             $new->from = null;
         }
         if ($request->has('to')) {
-            $new->to = json_encode($request->get('to'), JSON_UNESCAPED_UNICODE);
+            $new->to = json_encode($request->input('to'), JSON_UNESCAPED_UNICODE);
         } else {
             $new->to = null;
         }
         if ($request->has('match')) {
-            $new->match = json_encode($request->get('match'), JSON_UNESCAPED_UNICODE);
+            $new->match = json_encode($request->input('match'), JSON_UNESCAPED_UNICODE);
         } else {
             $new->match = null;
         }
@@ -150,22 +150,22 @@ class RelationController extends Controller
             return $this->error(__('auth.failed'));
         }
 
-        $relation->name = $request->get('name');
-        $relation->case = $request->get('case');
-        $relation->category = $request->get('category');
+        $relation->name = $request->input('name');
+        $relation->case = $request->input('case');
+        $relation->category = $request->input('category');
 
         if ($request->has('from')) {
-            $relation->from = json_encode($request->get('from'), JSON_UNESCAPED_UNICODE);
+            $relation->from = json_encode($request->input('from'), JSON_UNESCAPED_UNICODE);
         } else {
             $relation->from = null;
         }
         if ($request->has('to')) {
-            $relation->to = json_encode($request->get('to'), JSON_UNESCAPED_UNICODE);
+            $relation->to = json_encode($request->input('to'), JSON_UNESCAPED_UNICODE);
         } else {
             $relation->to = null;
         }
         if ($request->has('match')) {
-            $relation->match = json_encode($request->get('match'), JSON_UNESCAPED_UNICODE);
+            $relation->match = json_encode($request->input('match'), JSON_UNESCAPED_UNICODE);
         } else {
             $relation->match = null;
         }
@@ -231,7 +231,7 @@ class RelationController extends Controller
             return $this->error(__('auth.failed'));
         }
 
-        $filename = $request->get('filename');
+        $filename = $request->input('filename');
         $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
         $reader->setReadDataOnly(true);
         $spreadsheet = $reader->load($filename);

api-v12/app/Http/Controllers/ResetPasswordController.php

@@ -26,24 +26,23 @@ class ResetPasswordController extends Controller
     public function store(Request $request)
     {
         //
-        $user = UserInfo::where('reset_password_token',$request->get('token'))
-                        ->where('username',$request->get('username'))
-                        ->first();
-        if(!$user){
-        return $this->error('no token',404,404);
+        $user = UserInfo::where('reset_password_token', $request->input('token'))
+            ->where('username', $request->input('username'))
+            ->first();
+        if (!$user) {
+            return $this->error('no token', 404, 404);
         }
-        if(mb_strlen($request->get('password'),'UTF-8')<6){
-            return $this->error('input is invalid',402,402);
+        if (mb_strlen($request->input('password'), 'UTF-8') < 6) {
+            return $this->error('input is invalid', 402, 402);
         }
-        $user->password = md5($request->get('password'));
+        $user->password = md5($request->input('password'));
         $user->reset_password_token = null;
         $ok = $user->save();
-        if($ok){
+        if ($ok) {
             return $this->ok($user);
-        }else{
-            return $this->error('fail to set password',500,500);
+        } else {
+            return $this->error('fail to set password', 500, 500);
         }
-
     }
 
     /**
@@ -55,10 +54,10 @@ class ResetPasswordController extends Controller
     public function show($token)
     {
         //
-        $user = UserInfo::where('reset_password_token',$token)
-                        ->select(['username'])->first();
-        if(!$user){
-            return $this->error('no token',404,404);
+        $user = UserInfo::where('reset_password_token', $token)
+            ->select(['username'])->first();
+        if (!$user) {
+            return $this->error('no token', 404, 404);
         }
         return $this->ok($user);
     }

api-v12/app/Http/Controllers/SearchController.php

@@ -28,14 +28,15 @@ class SearchController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function index(Request $request){
-        switch ($request->get('view','pali')) {
+    public function index(Request $request)
+    {
+        switch ($request->input('view', 'pali')) {
             case 'pali':
-                $pageHead = ['M','P','T','V','O'];
-                $key = $request->get('key');
-                if(substr($key,0,4) === 'para' || in_array(substr($key,0,1),$pageHead)){
+                $pageHead = ['M', 'P', 'T', 'V', 'O'];
+                $key = $request->input('key');
+                if (substr($key, 0, 4) === 'para' || in_array(substr($key, 0, 1), $pageHead)) {
                     return $this->page($request);
-                }else{
+                } else {
                     return $this->pali_rpc($request);
                 }
                 break;
@@ -43,29 +44,29 @@ class SearchController extends Controller
                 return $this->page($request);
                 break;
             case 'title':
-                $key = strtolower($request->get('key'));
-                $table = PaliText::where('level','<',8)
-                                 ->where(function ($query) use($key){
-                                     $query->where('title_en','like',"%{$key}%")
-                                         ->orWhere('title','like',"%{$key}%");
-                                 });
+                $key = strtolower($request->input('key'));
+                $table = PaliText::where('level', '<', 8)
+                    ->where(function ($query) use ($key) {
+                        $query->where('title_en', 'like', "%{$key}%")
+                            ->orWhere('title', 'like', "%{$key}%");
+                    });
                 Log::info($table->toSql());
-                if($request->has('tags')){
+                if ($request->has('tags')) {
                     //查询搜索范围
-                    $tagItems = explode(';',$request->get('tags'));
+                    $tagItems = explode(';', $request->input('tags'));
                     $bookId = [];
                     foreach ($tagItems as $tagItem) {
                         # code...
-                        $bookId = array_merge($bookId,$this->getBookIdByTags(explode(',',$tagItem)));
+                        $bookId = array_merge($bookId, $this->getBookIdByTags(explode(',', $tagItem)));
                     }
-                    $table = $table->whereIn('pcd_book_id',$bookId);
+                    $table = $table->whereIn('pcd_book_id', $bookId);
                 }
                 $count = $table->count();
-                $table = $table->orderBy($request->get('orderby','book'),$request->get('dir','asc'));
-                $table = $table->skip($request->get("offset",0))
-                               ->take($request->get('limit',10));
+                $table = $table->orderBy($request->input('orderby', 'book'), $request->input('dir', 'asc'));
+                $table = $table->skip($request->input("offset", 0))
+                    ->take($request->input('limit', 10));
                 $result = $table->get();
-                return $this->ok(["rows"=>SearchTitleResource::collection($result),"count"=>$count]);
+                return $this->ok(["rows" => SearchTitleResource::collection($result), "count" => $count]);
                 break;
             default:
                 # code...
@@ -76,15 +77,15 @@ class SearchController extends Controller
     {
         //
         $bookId = [];
-        if($request->has('book')){
-            $bookId = [(int)$request->get('book')];
-        }else if($request->has('tags')){
+        if ($request->has('book')) {
+            $bookId = [(int)$request->input('book')];
+        } else if ($request->has('tags')) {
             //查询搜索范围
             //查询搜索范围
-            $tagItems = explode(';',$request->get('tags'));
+            $tagItems = explode(';', $request->input('tags'));
 
             foreach ($tagItems as $tagItem) {
-                $bookId = array_merge($bookId,$this->getBookIdByTags(explode(',',$tagItem)));
+                $bookId = array_merge($bookId, $this->getBookIdByTags(explode(',', $tagItem)));
             }
         }
 
@@ -92,13 +93,13 @@ class SearchController extends Controller
         $searchBooks = [];
         $searchBookId = [];
         $queryBookId = '';
-        if(count($bookId) > 0){
-            $queryBookId = ' AND pcd_book_id in ('.implode(',',$bookId).') ';
+        if (count($bookId) > 0) {
+            $queryBookId = ' AND pcd_book_id in (' . implode(',', $bookId) . ') ';
         }
-        $key = explode(';',$request->get('key')) ;
+        $key = explode(';', $request->input('key'));
         $param = [];
         $countParam = [];
-        switch ($request->get('match','case')) {
+        switch ($request->input('match', 'case')) {
             case 'complete':
             case 'case':
                 # code...
@@ -106,13 +107,13 @@ class SearchController extends Controller
                                                 full_text_search_weighted,
                                                 websearch_to_tsquery('pali', ?)) ";
                 $querySelect_rank_head = implode('+', array_fill(0, count($key), $querySelect_rank_base));
-                $param = array_merge($param,$key);
+                $param = array_merge($param, $key);
                 $querySelect_rank = " {$querySelect_rank_head} AS rank, ";
                 $querySelect_highlight = " ts_headline('pali', content,
                                             websearch_to_tsquery('pali', ?),
                                             'StartSel = ~~, StopSel = ~~,MaxWords=3500, MinWords=3500,HighlightAll=TRUE')
                                             AS highlight,";
-                array_push($param,implode(' ',$key));
+                array_push($param, implode(' ', $key));
                 break;
             case 'similar':
                 # 形似，去掉变音符号
@@ -122,7 +123,7 @@ class SearchController extends Controller
                         full_text_search_weighted_unaccent,
                         websearch_to_tsquery('pali_unaccent', ?))
                     AS rank, ";
-                    $param[] = $key;
+                $param[] = $key;
                 $querySelect_highlight = " ts_headline('pali_unaccent', content,
                         websearch_to_tsquery('pali_unaccent', ?),
                         'StartSel = ~~, StopSel = ~~,MaxWords=3500, MinWords=3500,HighlightAll=TRUE')
@@ -130,18 +131,18 @@ class SearchController extends Controller
                 $param[] = $key;
                 break;
         }
-        $_queryWhere = $this->getQueryWhere($request->get('key'),$request->get('match','case'));
+        $_queryWhere = $this->getQueryWhere($request->input('key'), $request->input('match', 'case'));
         $queryWhere = $_queryWhere['query'];
-        $param = array_merge($param,$_queryWhere['param']);
+        $param = array_merge($param, $_queryWhere['param']);
 
         $querySelect_2 = "  book,paragraph,content ";
 
         $queryCount = "SELECT count(*) as co FROM fts_texts WHERE {$queryWhere} {$queryBookId};";
         $resultCount = DB::select($queryCount, $_queryWhere['param']);
 
-        $limit = $request->get('limit',10);
-        $offset = $request->get('offset',0);
-        switch ( $request->get('orderby',"rank")) {
+        $limit = $request->input('limit', 10);
+        $offset = $request->input('offset', 0);
+        switch ($request->input('orderby', "rank")) {
             case 'rank':
                 $orderby = " ORDER BY rank DESC ";
                 break;
@@ -167,30 +168,30 @@ class SearchController extends Controller
 
         $result = DB::select($query, $param);
 
-        return $this->ok(["rows"=>SearchResource::collection($result),"count"=>$resultCount[0]->co]);
+        return $this->ok(["rows" => SearchResource::collection($result), "count" => $resultCount[0]->co]);
     }
     public function pali_rpc(Request $request)
     {
         //
         $bookId = [];
-        if($request->has('book')){
-            $bookId = [(int)$request->get('book')];
-        }else if($request->has('tags')){
+        if ($request->has('book')) {
+            $bookId = [(int)$request->input('book')];
+        } else if ($request->has('tags')) {
             //查询搜索范围
             //查询搜索范围
-            $tagItems = explode(';',$request->get('tags'));
+            $tagItems = explode(';', $request->input('tags'));
 
             foreach ($tagItems as $tagItem) {
-                $bookId = array_merge($bookId,$this->getBookIdByTags(explode(',',$tagItem)));
+                $bookId = array_merge($bookId, $this->getBookIdByTags(explode(',', $tagItem)));
             }
         }
 
-        $key = explode(';',$request->get('key')) ;
-        $limit = $request->get('limit',10);
-        $offset = $request->get('offset',0);
-        $matchMode = $request->get('match','case');
-        $result = PaliSearch::search($key,$bookId,$matchMode,$offset,$limit);
-        return $this->ok(["rows"=>SearchResource::collection(collect($result['rows'])),"count"=>$result['total']]);
+        $key = explode(';', $request->input('key'));
+        $limit = $request->input('limit', 10);
+        $offset = $request->input('offset', 0);
+        $matchMode = $request->input('match', 'case');
+        $result = PaliSearch::search($key, $bookId, $matchMode, $offset, $limit);
+        return $this->ok(["rows" => SearchResource::collection(collect($result['rows'])), "count" => $result['total']]);
     }
 
     public function page(Request $request)
@@ -201,97 +202,99 @@ class SearchController extends Controller
         $searchBookId = [];
         $queryBookId = '';
         $bookId = [];
-        if($request->has('book')){
-            $bookId[] = $request->get('book');
-        }else if($request->has('tags')){
+        if ($request->has('book')) {
+            $bookId[] = $request->input('book');
+        } else if ($request->has('tags')) {
             //查询搜索范围
             //查询搜索范围
-            $tagItems = explode(';',$request->get('tags'));
+            $tagItems = explode(';', $request->input('tags'));
             foreach ($tagItems as $tagItem) {
                 # code...
-                $bookId = array_merge($bookId,$this->getBookIdByTags(explode(',',$tagItem)));
+                $bookId = array_merge($bookId, $this->getBookIdByTags(explode(',', $tagItem)));
             }
         }
 
-        $key = $request->get('key');
+        $key = $request->input('key');
         $searchKey = '';
-        $page = explode('.',$key);
-        if(count($page)===2){
-            $table = PageNumber::where('type',$request->get('type'))
-                               ->where('volume',(int)$page[0])
-                               ->where('page',(int)$page[1]);
-        }else{
-            if(is_numeric($key)){
-                $table = PageNumber::where('type',$request->get('type'))->where('page',$key);
-            }else{
-                $table = PageNumber::where('type',$request->get('type'))->where('page',(int)$key);
+        $page = explode('.', $key);
+        if (count($page) === 2) {
+            $table = PageNumber::where('type', $request->input('type'))
+                ->where('volume', (int)$page[0])
+                ->where('page', (int)$page[1]);
+        } else {
+            if (is_numeric($key)) {
+                $table = PageNumber::where('type', $request->input('type'))->where('page', $key);
+            } else {
+                $table = PageNumber::where('type', $request->input('type'))->where('page', (int)$key);
             }
         }
 
 
 
-        if(count($bookId)>0){
-            $table = $table->whereIn('pcd_book_id',$bookId);
+        if (count($bookId) > 0) {
+            $table = $table->whereIn('pcd_book_id', $bookId);
         }
         $count = $table->count();
-        $table = $table->select(['book','paragraph']);
-        $table->skip($request->get("offset",0))->take($request->get('limit',10));
+        $table = $table->select(['book', 'paragraph']);
+        $table->skip($request->input("offset", 0))->take($request->input('limit', 10));
         $result = $table->get();
 
-        return $this->ok(["rows"=>SearchResource::collection($result),"count"=>$count]);
+        return $this->ok(["rows" => SearchResource::collection($result), "count" => $count]);
     }
 
-    public function book_list(Request $request){
+    public function book_list(Request $request)
+    {
         $searchChapters = [];
         $searchBooks = [];
         $queryBookId = '';
 
         $bookId = [];
-        if($request->has('tags')){
+        if ($request->has('tags')) {
             //查询搜索范围
-            $tagItems = explode(';',$request->get('tags'));
+            $tagItems = explode(';', $request->input('tags'));
 
             foreach ($tagItems as $tagItem) {
                 # code...
-                $bookId = array_merge($bookId,$this->getBookIdByTags(explode(',',$tagItem)));
+                $bookId = array_merge($bookId, $this->getBookIdByTags(explode(',', $tagItem)));
             }
-            $queryBookId = ' AND pcd_book_id in ('.implode(',',$bookId).') ';
+            $queryBookId = ' AND pcd_book_id in (' . implode(',', $bookId) . ') ';
         }
-        $key = $request->get('key');
-        switch ($request->get('view','pali')) {
+        $key = $request->input('key');
+        switch ($request->input('view', 'pali')) {
             case 'pali':
                 # code...
-                $pageHead = ['M','P','T','V','O'];
-                if(substr($key,0,4) === 'para' || in_array(substr($key,0,1),$pageHead)){
+                $pageHead = ['M', 'P', 'T', 'V', 'O'];
+                if (substr($key, 0, 4) === 'para' || in_array(substr($key, 0, 1), $pageHead)) {
                     $queryWhere = "type='.ctl.' AND word = ?";
                     $query = "SELECT pcd_book_id, count(*) as co FROM wbw_templates WHERE {$queryWhere} {$queryBookId} GROUP BY pcd_book_id ORDER BY co DESC;";
                     $result = DB::select($query, [$key]);
+                } else {
 
-                }else{
-
-                    $rpc_result = PaliSearch::book_list(explode(';',$key),
-                                                        $bookId,
-                                                        $request->get('match','case'));
+                    $rpc_result = PaliSearch::book_list(
+                        explode(';', $key),
+                        $bookId,
+                        $request->input('match', 'case')
+                    );
                     $result = collect($rpc_result['rows']);
                     /*
-                        $queryWhere = $this->getQueryWhere($key,$request->get('match','case'));
+                        $queryWhere = $this->getQueryWhere($key,$request->input('match','case'));
                         $query = "SELECT pcd_book_id, count(*) as co FROM fts_texts WHERE {$queryWhere['query']} {$queryBookId} GROUP BY pcd_book_id ORDER BY co DESC;";
                         $result = DB::select($query, $queryWhere['param']);
                     */
                 }
                 break;
             case 'page':
-                $type = $request->get('type','P');
+                $type = $request->input('type', 'P');
                 $word = "{$type}%0{$key}";
                 $queryWhere = "type='.ctl.' AND word like ?";
                 $query = "SELECT pcd_book_id, count(*) as co FROM wbw_templates WHERE {$queryWhere} {$queryBookId} GROUP BY pcd_book_id ORDER BY co DESC;";
                 $result = DB::select($query, [$word]);
                 break;
             case 'title':
-                $keyLike = '%'.$key.'%';
+                $keyLike = '%' . $key . '%';
                 $queryWhere = "\"level\" < 8 and (\"title_en\"::text like ? or \"title\"::text like ?)";
                 $query = "SELECT pcd_book_id, count(*) as co FROM pali_texts WHERE {$queryWhere} {$queryBookId} GROUP BY pcd_book_id ORDER BY co DESC;";
-                $result = DB::select($query, [$keyLike,$keyLike]);
+                $result = DB::select($query, [$keyLike, $keyLike]);
                 break;
             default:
                 # code...
@@ -299,16 +302,16 @@ class SearchController extends Controller
                 break;
         }
 
-        if($result){
-            return $this->ok(["rows"=>SearchBookResource::collection($result),"count"=>count($result)]);
-        }else{
-            return $this->ok(["rows"=>[],"count"=>0]);
+        if ($result) {
+            return $this->ok(["rows" => SearchBookResource::collection($result), "count" => count($result)]);
+        } else {
+            return $this->ok(["rows" => [], "count" => 0]);
         }
-
     }
 
-    private function getQueryWhere($key,$match){
-        $key = explode(';',$key) ;
+    private function getQueryWhere($key, $match)
+    {
+        $key = explode(';', $key);
         $param = [];
         $queryWhere = '';
         switch ($match) {
@@ -318,7 +321,7 @@ class SearchController extends Controller
                 $queryWhereBase = " full_text_search_weighted @@ websearch_to_tsquery('pali', ?) ";
                 $queryWhereBody = implode(' or ', array_fill(0, count($key), $queryWhereBase));
                 $queryWhere = " ({$queryWhereBody}) ";
-                $param = array_merge($param,$key);
+                $param = array_merge($param, $key);
                 break;
             case 'similar':
                 # 形似，去掉变音符号
@@ -327,49 +330,49 @@ class SearchController extends Controller
                 $param = [$key];
                 break;
         };
-        return (['query'=>$queryWhere,'param'=>$param]);
+        return (['query' => $queryWhere, 'param' => $param]);
     }
 
-    public function getBookIdByTags($tags){
+    public function getBookIdByTags($tags)
+    {
         $searchBookId = [];
-        if(empty($tags)){
+        if (empty($tags)) {
             return $searchBookId;
         }
 
         //查询搜索范围
-        $tagIds = Tag::whereIn('name',$tags)->select('id')->get();
-        $paliTextIds = TagMap::where('table_name','pali_texts')->whereIn('tag_id',$tagIds)->select('anchor_id')->get();
-        $paliPara=[];
+        $tagIds = Tag::whereIn('name', $tags)->select('id')->get();
+        $paliTextIds = TagMap::where('table_name', 'pali_texts')->whereIn('tag_id', $tagIds)->select('anchor_id')->get();
+        $paliPara = [];
         foreach ($paliTextIds as $key => $value) {
             # code...
-            if(isset($paliPara[$value->anchor_id])){
+            if (isset($paliPara[$value->anchor_id])) {
                 $paliPara[$value->anchor_id]++;
-            }else{
-                $paliPara[$value->anchor_id]=1;
+            } else {
+                $paliPara[$value->anchor_id] = 1;
             }
         }
-        $paliId=[];
+        $paliId = [];
         foreach ($paliPara as $key => $value) {
             # code...
-            if($value===count($tags)){
+            if ($value === count($tags)) {
                 $paliId[] = $key;
             }
         }
-        $para = PaliText::where('level',1)->whereIn('uid',$paliId)->get();
+        $para = PaliText::where('level', 1)->whereIn('uid', $paliId)->get();
 
-        if(count($para)>0){
+        if (count($para) > 0) {
             foreach ($para as $key => $value) {
                 # code...
-                $book_id = BookTitle::where('book',$value['book'])
-                                    ->where('paragraph',$value['paragraph'])
-                                    ->value('sn');
-                if(!empty($book_id)){
+                $book_id = BookTitle::where('book', $value['book'])
+                    ->where('paragraph', $value['paragraph'])
+                    ->value('sn');
+                if (!empty($book_id)) {
                     $searchBookId[] = $book_id;
                 }
             }
         }
         return $searchBookId;
-
     }
 
     /**

api-v12/app/Http/Controllers/SearchPaliDataController.php

@@ -1,8 +1,10 @@
 <?php
+
 /**
  * 输出巴利语全文搜索数据
  * 提供给搜索引擎
  */
+
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
@@ -19,83 +21,85 @@ class SearchPaliDataController extends Controller
     public function index(Request $request)
     {
         //
-        $book = $request->get('book');
+        $book = $request->input('book');
 
-        $maxParagraph = WbwTemplate::where('book',$book)->max('paragraph');
-        $pageSize = $request->get('page_size',1000);
-        $start = $request->get('start',1);
+        $maxParagraph = WbwTemplate::where('book', $book)->max('paragraph');
+        $pageSize = $request->input('page_size', 1000);
+        $start = $request->input('start', 1);
         $output = array();
-        if($start+$pageSize>$maxParagraph){
-            $endOfPara = $maxParagraph+1;
-        }else{
-            $endOfPara = $start+$pageSize;
+        if ($start + $pageSize > $maxParagraph) {
+            $endOfPara = $maxParagraph + 1;
+        } else {
+            $endOfPara = $start + $pageSize;
         }
 
-        for($iPara=$start; $iPara < $endOfPara; $iPara++){
-            $content = $this->getContent($book,$iPara);
+        for ($iPara = $start; $iPara < $endOfPara; $iPara++) {
+            $content = $this->getContent($book, $iPara);
             //查找黑体字
-            $words = WbwTemplate::where('book',$book)
-                                ->where('paragraph',$iPara)
-                                ->orderBy('wid')->get();
+            $words = WbwTemplate::where('book', $book)
+                ->where('paragraph', $iPara)
+                ->orderBy('wid')->get();
             $bold1 = array();
             $bold2 = array();
             $bold3 = array();
             $currBold = array();
             foreach ($words as $word) {
-                if($word->style==='bld'){
+                if ($word->style === 'bld') {
                     $currBold[] = $word->real;
-                }else{
+                } else {
                     $countBold = count($currBold);
-                    if($countBold === 1){
+                    if ($countBold === 1) {
                         $bold1[] = $currBold[0];
-                    }else if($countBold === 2){
-                        $bold2 = array_merge($bold2,$currBold);
-                    }else if($countBold > 0){
-                        $bold3 = array_merge($bold3,$currBold);
+                    } else if ($countBold === 2) {
+                        $bold2 = array_merge($bold2, $currBold);
+                    } else if ($countBold > 0) {
+                        $bold3 = array_merge($bold3, $currBold);
                     }
                     $currBold = [];
                 }
             }
-            $pcd_book = BookTitle::where('book',$book)
-                    ->where('paragraph','<=',$iPara)
-                    ->orderBy('paragraph','desc')
-                    ->first();
-            if($pcd_book){
+            $pcd_book = BookTitle::where('book', $book)
+                ->where('paragraph', '<=', $iPara)
+                ->orderBy('paragraph', 'desc')
+                ->first();
+            if ($pcd_book) {
                 $pcd_book_id = $pcd_book->sn;
-            }else{
-                $pcd_book_id = BookTitle::where('book',$book)
-                                        ->orderBy('paragraph')
-                                        ->value('sn');
+            } else {
+                $pcd_book_id = BookTitle::where('book', $book)
+                    ->orderBy('paragraph')
+                    ->value('sn');
             }
 
-            $update = ['book'=>$book,
-                        'paragraph' => $iPara,
-                        'bold1' => implode(' ',$bold1),
-                        'bold2' => implode(' ',$bold2),
-                        'bold3' => implode(' ',$bold3),
-                        'content' => $content,
-                        'pcd_book_id' => $pcd_book_id
-                    ];
+            $update = [
+                'book' => $book,
+                'paragraph' => $iPara,
+                'bold1' => implode(' ', $bold1),
+                'bold2' => implode(' ', $bold2),
+                'bold3' => implode(' ', $bold3),
+                'content' => $content,
+                'pcd_book_id' => $pcd_book_id
+            ];
             $output[] = $update;
         }
-        return $this->ok(['rows'=>$output,'count'=>$maxParagraph]);
+        return $this->ok(['rows' => $output, 'count' => $maxParagraph]);
     }
-    private function getContent($book,$para){
-        $words = WbwTemplate::where('book',$book)
-                            ->where('paragraph',$para)
-                            ->where('type',"<>",".ctl.")
-                            ->orderBy('wid')->get();
+    private function getContent($book, $para)
+    {
+        $words = WbwTemplate::where('book', $book)
+            ->where('paragraph', $para)
+            ->where('type', "<>", ".ctl.")
+            ->orderBy('wid')->get();
         $content = '';
         foreach ($words as  $word) {
-            if($word->style === 'bld'){
-                if(strpos($word->word,"{")===FALSE){
+            if ($word->style === 'bld') {
+                if (strpos($word->word, "{") === FALSE) {
                     $content .= "**{$word->word}** ";
-                }else{
-                    $content .= str_replace(['{','}'],['**','** '],$word->word);
+                } else {
+                    $content .= str_replace(['{', '}'], ['**', '** '], $word->word);
                 }
-            }else if($word->style === 'note'){
+            } else if ($word->style === 'note') {
                 $content .= " _{$word->word}_ ";
-            }else{
+            } else {
                 $content .= $word->word . " ";
             }
         }

api-v12/app/Http/Controllers/SearchPaliWbwController.php

@@ -21,78 +21,79 @@ class SearchPaliWbwController extends Controller
         //获取书的范围
         $bookId = [];
         $search = new SearchController;
-        if($request->has('book')){
-            foreach (explode(',',$request->get('book')) as $key => $id) {
+        if ($request->has('book')) {
+            foreach (explode(',', $request->input('book')) as $key => $id) {
                 $bookId[] = (int)$id;
             }
-        }else if($request->has('tags')){
+        } else if ($request->has('tags')) {
             //查询搜索范围
             //查询搜索范围
-            $tagItems = explode(';',$request->get('tags'));
+            $tagItems = explode(';', $request->input('tags'));
 
             foreach ($tagItems as $tagItem) {
-                $bookId = array_merge($bookId,$search->getBookIdByTags(explode(',',$tagItem)));
+                $bookId = array_merge($bookId, $search->getBookIdByTags(explode(',', $tagItem)));
             }
         }
 
-        $keyWords = explode(',',$request->get('key'));
-        $table = WbwTemplate::whereIn('real',$keyWords)
-                            ->groupBy(['book','paragraph'])
-                            ->selectRaw('book,paragraph,sum(weight) as rank');
+        $keyWords = explode(',', $request->input('key'));
+        $table = WbwTemplate::whereIn('real', $keyWords)
+            ->groupBy(['book', 'paragraph'])
+            ->selectRaw('book,paragraph,sum(weight) as rank');
         $whereBold = '';
-        if($request->get('bold')==='on'){
-            $table = $table->where('style','bld');
+        if ($request->input('bold') === 'on') {
+            $table = $table->where('style', 'bld');
             $whereBold = " and style='bld'";
-        }else if($request->get('bold')==='off'){
-            $table = $table->where('style','<>','bld');
+        } else if ($request->input('bold') === 'off') {
+            $table = $table->where('style', '<>', 'bld');
             $whereBold = " and style <> 'bld'";
         }
-        $placeholderWord = implode(",",array_fill(0, count($keyWords), '?')) ;
+        $placeholderWord = implode(",", array_fill(0, count($keyWords), '?'));
         $whereWord = "real in ({$placeholderWord})";
         $whereBookId = '';
-        if(count($bookId)>0){
-            $table =  $table->whereIn('pcd_book_id',$bookId);
-            $placeholderBookId = implode(",",array_fill(0, count($bookId), '?')) ;
+        if (count($bookId) > 0) {
+            $table =  $table->whereIn('pcd_book_id', $bookId);
+            $placeholderBookId = implode(",", array_fill(0, count($bookId), '?'));
             $whereBookId = " and pcd_book_id in ({$placeholderBookId}) ";
         }
         $queryCount = "SELECT count(*) FROM ( SELECT book,paragraph FROM wbw_templates WHERE $whereWord $whereBookId $whereBold  GROUP BY book,paragraph) T;";
-        $count = DB::select($queryCount,array_merge($keyWords,$bookId));
+        $count = DB::select($queryCount, array_merge($keyWords, $bookId));
 
-        $table =  $table->orderBy('rank','desc');
-        $table =  $table->skip($request->get("offset",0))
-                        ->take($request->get('limit',10));
+        $table =  $table->orderBy('rank', 'desc');
+        $table =  $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 10));
 
         $result = $table->get();
         return $this->ok([
-            "rows"=>SearchPaliWbwResource::collection($result),
-            "count"=>$count[0]->count,
-            ]);
+            "rows" => SearchPaliWbwResource::collection($result),
+            "count" => $count[0]->count,
+        ]);
     }
 
-    public function book_list(Request $request){
+    public function book_list(Request $request)
+    {
         //获取书的范围
         $bookId = [];
         $search = new SearchController;
-        if($request->has('tags')){
+        if ($request->has('tags')) {
             //查询搜索范围
             //查询搜索范围
-            $tagItems = explode(';',$request->get('tags'));
+            $tagItems = explode(';', $request->input('tags'));
 
             foreach ($tagItems as $tagItem) {
-                $bookId = array_merge($bookId,$search->getBookIdByTags(explode(',',$tagItem)));
+                $bookId = array_merge($bookId, $search->getBookIdByTags(explode(',', $tagItem)));
             }
         }
-        $keyWords = explode(',',$request->get('key'));
-        $table = WbwTemplate::whereIn('real',$keyWords);
+        $keyWords = explode(',', $request->input('key'));
+        $table = WbwTemplate::whereIn('real', $keyWords);
 
-        if(count($bookId)>0){
-            $table = $table->whereIn('pcd_book_id',$bookId);
+        if (count($bookId) > 0) {
+            $table = $table->whereIn('pcd_book_id', $bookId);
         }
         $table = $table->groupBy('pcd_book_id')
-                       ->selectRaw('pcd_book_id,count(*) as co')
-                       ->orderBy('co','desc');
+            ->selectRaw('pcd_book_id,count(*) as co')
+            ->orderBy('co', 'desc');
         $result = $table->get();
-        return $this->ok(["rows"=>SearchBookResource::collection($result),"count"=>count($result)]);
+        return $this->ok(["rows" => SearchBookResource::collection($result), "count" => count($result)]);
     }
     /**
      * Store a newly created resource in storage.

api-v12/app/Http/Controllers/SearchTitleController.php

@@ -16,19 +16,19 @@ class SearchTitleController extends Controller
     public function index(Request $request)
     {
         //
-        $key = strtolower($request->get('key'));
-        $table = PaliText::where('level','<',8)
-                         ->where(function ($query) use($key){
-                            $query->where('title_en','like',"%{$key}%")
-                                  ->orWhere('title','like',"%{$key}%");
-                        });
+        $key = strtolower($request->input('key'));
+        $table = PaliText::where('level', '<', 8)
+            ->where(function ($query) use ($key) {
+                $query->where('title_en', 'like', "%{$key}%")
+                    ->orWhere('title', 'like', "%{$key}%");
+            });
         $count = $table->count();
         $table = $table->orderBy('title_en');
-        $table = $table->skip($request->get("offset",0))
-                         ->take($request->get('limit',10));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 10));
 
         $result = $table->get();
-        return $this->ok(["rows"=>SearchTitleIndexResource::collection($result),"count"=>$count]);
+        return $this->ok(["rows" => SearchTitleIndexResource::collection($result), "count" => $count]);
     }
 
     /**

api-v12/app/Http/Controllers/SentHistoryController.php

@@ -19,28 +19,30 @@ class SentHistoryController extends Controller
         //
         switch ($request->view) {
             case 'sentence':
-                $table = SentHistory::where('sent_uid',$request->get('id'));
+                $table = SentHistory::where('sent_uid', $request->input('id'));
                 break;
             default:
                 return $this->error('known view');
                 break;
         }
-        if($request->has('fork')){
+        if ($request->has('fork')) {
             $table = $table->whereNotNull('fork_from');
         }
         $count = $table->count();
-        $table->orderBy($request->get('order','created_at'),
-                        $request->get('dir','desc'));
-        $table->skip($request->get("offset",0))
-              ->take($request->get('limit',100));
+        $table->orderBy(
+            $request->input('order', 'created_at'),
+            $request->input('dir', 'desc')
+        );
+        $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 100));
 
         $result = $table->get();
-		return $this->ok(["rows"=>SentHistoryResource::collection($result),"count"=>$count]);
-
+        return $this->ok(["rows" => SentHistoryResource::collection($result), "count" => $count]);
     }
 
-    public function contribution(Request $request){
-                /**
+    public function contribution(Request $request)
+    {
+        /**
          *  计算用户贡献度
          *  算法：统计句子历史记录里的用户贡献句子的数量
          *  TODO:
@@ -48,18 +50,18 @@ class SentHistoryController extends Controller
          *  只统计一个月内的数值
          */
         $result = SentHistory::select('user_uid')
-                            ->selectRaw('count(*)')
-                            ->groupBy('user_uid')
-                            ->orderBy('count','desc')
-                            ->take(10)
-                            ->get();
+            ->selectRaw('count(*)')
+            ->groupBy('user_uid')
+            ->orderBy('count', 'desc')
+            ->take(10)
+            ->get();
 
 
         foreach ($result as $key => $user) {
             $userInfo = UserApi::getByUuid($user->user_uid);
             $user->username = [
-                'nickname'=>$userInfo['nickName'],
-                'username'=>$userInfo['userName'],
+                'nickname' => $userInfo['nickName'],
+                'username' => $userInfo['userName'],
             ];
         }
         return $this->ok($result);

api-v12/app/Http/Controllers/SentInChannelController.php

@@ -29,35 +29,44 @@ class SentInChannelController extends Controller
     public function store(Request $request)
     {
         //
-        $sent = $request->get('sentences') ;
+        $sent = $request->input('sentences');
         $query = [];
         foreach ($sent as $value) {
             # code...
-            $ids = explode('-',$value);
-            if(count($ids)===4){
+            $ids = explode('-', $value);
+            if (count($ids) === 4) {
                 $query[] = $ids;
             }
         }
         $channelsQuery = array();
-        $channelsInput = $request->get('channels');
+        $channelsInput = $request->input('channels');
         foreach ($channelsInput as $value) {
-            if(Str::isUuid($value)){
+            if (Str::isUuid($value)) {
                 $channelsQuery[] = $value;
-            }else{
+            } else {
                 $channelId = ChannelApi::getSysChannel($value);
-                if($channelId){
+                if ($channelId) {
                     $channelsQuery[] = $channelId;
                 }
             }
         }
 
-        $table = Sentence::select(['id','book_id','paragraph',
-                                   'word_start','word_end','content','content_type',
-                                   'editor_uid','channel_uid','updated_at'])
-                        ->whereIn('channel_uid', $channelsQuery)
-                        ->whereIns(['book_id','paragraph','word_start','word_end'],$query);
+        $table = Sentence::select([
+            'id',
+            'book_id',
+            'paragraph',
+            'word_start',
+            'word_end',
+            'content',
+            'content_type',
+            'editor_uid',
+            'channel_uid',
+            'updated_at'
+        ])
+            ->whereIn('channel_uid', $channelsQuery)
+            ->whereIns(['book_id', 'paragraph', 'word_start', 'word_end'], $query);
         $result = $table->get();
-        return $this->ok(["rows"=>$result,"count"=>count($result)]);
+        return $this->ok(["rows" => $result, "count" => count($result)]);
     }
 
     /**

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

@@ -27,13 +27,13 @@ class SentPrController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'sent-info':
-                $table = SentPr::where('book_id', $request->get('book'))
-                    ->where('paragraph', $request->get('para'))
-                    ->where('word_start', $request->get('start'))
-                    ->where('word_end', $request->get('end'))
-                    ->where('channel_uid', $request->get('channel'));
+                $table = SentPr::where('book_id', $request->input('book'))
+                    ->where('paragraph', $request->input('para'))
+                    ->where('word_start', $request->input('start'))
+                    ->where('word_end', $request->input('end'))
+                    ->where('channel_uid', $request->input('channel'));
                 $all_count = $table->count();
                 $result = $table->orderBy('created_at', 'desc')->get();
 
@@ -63,7 +63,7 @@ class SentPrController extends Controller
     public function pr_tree(Request $request)
     {
         $output = [];
-        $sentences = $request->get("data");
+        $sentences = $request->input("data");
         foreach ($sentences as $key => $sentence) {
             # 先查句子信息
             $sentInfo = Sentence::where('book_id', $sentence['book'])
@@ -153,8 +153,8 @@ class SentPrController extends Controller
         $suggestionData =  [
             'data' => new SentPrResource($new),
             'token' => AuthApi::getToken($request),
-            'notification' => $request->get('notification', true),
-            'webhook' => $request->get('webhook', true),
+            'notification' => $request->input('notification', true),
+            'webhook' => $request->input('webhook', true),
         ];
         Mq::publish(
             'suggestion',
@@ -226,7 +226,7 @@ class SentPrController extends Controller
         if ($sentPr->editor_uid !== $user['user_uid']) {
             return $this->error('not power', 403, 403);
         }
-        $sentPr->content = $request->get('text');
+        $sentPr->content = $request->input('text');
         $sentPr->modify_time = time() * 1000;
         $sentPr->save();
         return $this->ok($sentPr);

api-v12/app/Http/Controllers/SentSimController.php

@@ -17,28 +17,28 @@ class SentSimController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'sentence':
-                $sentId = PaliSentence::where('book',$request->get('book'))
-                                ->where('paragraph',$request->get('paragraph'))
-                                ->where('word_begin',$request->get('start'))
-                                ->where('word_end',$request->get('end'))
-                                ->value('id');
-                if(!$sentId){
+                $sentId = PaliSentence::where('book', $request->input('book'))
+                    ->where('paragraph', $request->input('paragraph'))
+                    ->where('word_begin', $request->input('start'))
+                    ->where('word_end', $request->input('end'))
+                    ->value('id');
+                if (!$sentId) {
                     return $this->error("no sent");
                 }
-                $table = SentSim::where('sent1',$sentId)
-                                ->orderBy('sim','desc');
+                $table = SentSim::where('sent1', $sentId)
+                    ->orderBy('sim', 'desc');
                 break;
         }
-        $table->where('sim','>=',$request->get('sim',0));
+        $table->where('sim', '>=', $request->input('sim', 0));
         $count = $table->count();
-        $table->skip($request->get("offset",0))
-              ->take($request->get('limit',20));
+        $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 20));
         $result = $table->get();
-        if($result){
-            return $this->ok(["rows"=>SentSimResource::collection($result),"count"=>$count]);
-        }else{
+        if ($result) {
+            return $this->ok(["rows" => SentSimResource::collection($result), "count" => $count]);
+        } else {
             return $this->error("no data");
         }
     }

api-v12/app/Http/Controllers/SentenceAttachmentController.php

@@ -19,17 +19,17 @@ class SentenceAttachmentController extends Controller
     {
         switch ($request->view) {
             case 'sentence':
-                $table = SentenceAttachment::where('sentence_id', $request->get('id'));
+                $table = SentenceAttachment::where('sentence_id', $request->input('id'));
                 break;
             default:
                 return $this->error('known view');
                 break;
         }
 
-        $table->orderBy($request->get('order', 'updated_at'), $request->get('dir', 'desc'));
+        $table->orderBy($request->input('order', 'updated_at'), $request->input('dir', 'desc'));
         $count = $table->count();
-        $table->skip($request->get("offset", 0))
-            ->take($request->get('limit', 1000));
+        $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 1000));
 
         $result = $table->get();
         return $this->ok([

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

@@ -53,12 +53,12 @@ class SentenceController extends Controller
             'updated_at'
         ];
 
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'public':
                 //获取全部公开的译文
                 //首先获取某个类型的 channel 列表
                 $channels = [];
-                $channel_type = $request->get('channel_type', 'translation');
+                $channel_type = $request->input('channel_type', 'translation');
                 if ($channel_type === "original") {
                     $pali_channel = ChannelApi::getSysChannel("_System_Pali_VRI_");
                     if ($pali_channel !== false) {
@@ -75,13 +75,13 @@ class SentenceController extends Controller
                 }
                 $table = Sentence::select($indexCol)
                     ->whereIn('channel_uid', $channels)
-                    ->where('updated_at', '>', $request->get('updated_after', '1970-1-1'));
+                    ->where('updated_at', '>', $request->input('updated_after', '1970-1-1'));
                 break;
             case 'fulltext':
                 if (isset($_COOKIE['user_uid'])) {
                     $userUid = $_COOKIE['user_uid'];
                 }
-                $key = $request->get('key');
+                $key = $request->input('key');
                 if (empty($key)) {
                     return $this->error("没有关键词");
                 }
@@ -92,7 +92,7 @@ class SentenceController extends Controller
                 break;
             case 'channel':
                 //句子编号列表在某个channel下的全部内容
-                $sent = explode(',', $request->get('sentence'));
+                $sent = explode(',', $request->input('sentence'));
                 $query = [];
                 foreach ($sent as $value) {
                     # code...
@@ -100,7 +100,7 @@ class SentenceController extends Controller
                     $query[] = $ids;
                 }
                 $table = Sentence::select($indexCol)
-                    ->where('channel_uid', $request->get('channel'))
+                    ->where('channel_uid', $request->input('channel'))
                     ->whereIns(['book_id', 'paragraph', 'word_start', 'word_end'], $query);
                 break;
             case 'sent-can-read':
@@ -109,7 +109,7 @@ class SentenceController extends Controller
                  */
                 //获取用户有阅读权限的所有channel
                 //全网公开
-                $type = $request->get('type', 'translation');
+                $type = $request->input('type', 'translation');
                 $channelTable = Channel::where("type", $type)->select(['uid', 'name']);
                 $channelPub = $channelTable->where('status', 30)->get();
 
@@ -152,7 +152,7 @@ class SentenceController extends Controller
                     ];
                 }
                 $channels = [];
-                $excludeChannels = explode(',', $request->get('excludes'));
+                $excludeChannels = explode(',', $request->input('excludes'));
 
                 foreach ($channelCanRead as $key => $value) {
                     # code...
@@ -160,7 +160,7 @@ class SentenceController extends Controller
                         $channels[] = $key;
                     }
                 }
-                $sent = explode('-', $request->get('sentence'));
+                $sent = explode('-', $request->input('sentence'));
                 $table = Sentence::select($indexCol)
                     ->whereIn('channel_uid', $channels)
                     ->where('ver', '>', 1)
@@ -170,17 +170,17 @@ class SentenceController extends Controller
                     ->where('word_end', $sent[3]);
                 break;
             case 'chapter':
-                $chapter =  PaliTextApi::getChapterStartEnd($request->get('book'), $request->get('para'));
+                $chapter =  PaliTextApi::getChapterStartEnd($request->input('book'), $request->input('para'));
                 $table = Sentence::where('ver', '>', 1)
-                    ->where('book_id', $request->get('book'))
+                    ->where('book_id', $request->input('book'))
                     ->whereBetween('paragraph', $chapter)
-                    ->whereIn('channel_uid', explode(',', $request->get('channels')));
+                    ->whereIn('channel_uid', explode(',', $request->input('channels')));
                 break;
             case 'paragraph':
                 $table = Sentence::where('ver', '>', 1)
-                    ->where('book_id', $request->get('book'))
-                    ->whereIn('paragraph', explode(',', $request->get('para')))
-                    ->whereIn('channel_uid', explode(',', $request->get('channels')))
+                    ->where('book_id', $request->input('book'))
+                    ->whereIn('paragraph', explode(',', $request->input('para')))
+                    ->whereIn('channel_uid', explode(',', $request->input('channels')))
                     ->orderBy('book_id')->orderBy('paragraph')->orderBy('word_start');
                 break;
             case 'my-edit':
@@ -195,33 +195,33 @@ class SentenceController extends Controller
                 # code...
                 break;
         }
-        if (!empty($request->get("key"))) {
-            $table = $table->where('content', 'like', '%' . $request->get("key") . '%');
+        if (!empty($request->input("key"))) {
+            $table = $table->where('content', 'like', '%' . $request->input("key") . '%');
         }
 
         $count = $table->count();
-        if ($request->get('strlen', false)) {
+        if ($request->input('strlen', false)) {
             $totalStrLen = $table->sum('strlen');
         }
-        if ($request->get('view') !== 'paragraph') {
+        if ($request->input('view') !== 'paragraph') {
             $table = $table->orderBy(
-                $request->get('order', 'updated_at'),
-                $request->get('dir', 'desc')
+                $request->input('order', 'updated_at'),
+                $request->input('dir', 'desc')
             );
         }
 
-        $table = $table->skip($request->get("offset", 0))
-            ->take($request->get('limit', 1000));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 1000));
         $result = $table->get();
 
         if ($result) {
             $output = ["count" => $count];
             if (
-                $request->get('view') === 'sent-can-read' ||
-                $request->get('view') === 'channel' ||
-                $request->get('view') === 'chapter' ||
-                $request->get('view') === 'paragraph' ||
-                $request->get('view') === 'my-edit'
+                $request->input('view') === 'sent-can-read' ||
+                $request->input('view') === 'channel' ||
+                $request->input('view') === 'chapter' ||
+                $request->input('view') === 'paragraph' ||
+                $request->input('view') === 'my-edit'
             ) {
                 $output["rows"] = SentResource::collection($result);
             } else {
@@ -240,7 +240,7 @@ class SentenceController extends Controller
      */
     public function sent_in_channel(Request $request)
     {
-        $sent = $request->get('sentences');
+        $sent = $request->input('sentences');
         $query = [];
         foreach ($sent as $value) {
             # code...
@@ -250,7 +250,7 @@ class SentenceController extends Controller
             }
         }
         $table = Sentence::select(['id', 'book_id', 'paragraph', 'word_start', 'word_end', 'content', 'channel_uid', 'updated_at'])
-            ->where('channel_uid', $request->get('channel'))
+            ->where('channel_uid', $request->input('channel'))
             ->whereIns(['book_id', 'paragraph', 'word_start', 'word_end'], $query);
         $result = $table->get();
         if ($result) {
@@ -307,18 +307,18 @@ class SentenceController extends Controller
         if ($request->has('channel')) {
             if ($this->UserCanEdit(
                 $user["user_uid"],
-                $request->get('channel'),
-                $request->get('book', 0),
-                $request->get('access_token', null)
+                $request->input('channel'),
+                $request->input('book', 0),
+                $request->input('access_token', null)
             )) {
-                $destChannel = Channel::where('uid', $request->get('channel'))->first();;
+                $destChannel = Channel::where('uid', $request->input('channel'))->first();;
             } else {
                 return $this->error(__('auth.failed'), 403, 403);
             }
         }
         $sentFirst = null;
         $changedSent = [];
-        foreach ($request->get('sentences') as $key => $sent) {
+        foreach ($request->input('sentences') as $key => $sent) {
             # 权限
             if (!$request->has('channel')) {
 
@@ -398,7 +398,7 @@ class SentenceController extends Controller
 
             //保存历史记录
             if ($request->has('copy')) {
-                $fork_from = $request->get('fork_from', null);
+                $fork_from = $request->input('fork_from', null);
                 $this->saveHistory(
                     $row->uid,
                     $sent["editor_uid"],
@@ -505,19 +505,19 @@ class SentenceController extends Controller
             "uid" => Str::orderedUuid(),
             "create_time" => time() * 1000,
         ]);
-        $sent->content = $request->get('content');
+        $sent->content = $request->input('content');
         if ($request->has('contentType')) {
-            $sent->content_type = $request->get('contentType');
+            $sent->content_type = $request->input('contentType');
         }
         $sent->language = $channel->lang;
         $sent->status = $channel->status;
-        $sent->strlen = mb_strlen($request->get('content'), "UTF-8");
+        $sent->strlen = mb_strlen($request->input('content'), "UTF-8");
         $sent->modify_time = time() * 1000;
         if ($request->has('prEditor')) {
-            $realEditor = $request->get('prEditor');
+            $realEditor = $request->input('prEditor');
             $sent->acceptor_uid = $user["user_uid"];
-            $sent->pr_edit_at = $request->get('prEditAt');
-            $sent->pr_id = $request->get('prId');
+            $sent->pr_edit_at = $request->input('prEditAt');
+            $sent->pr_id = $request->input('prId');
         } else {
             $realEditor = $user["user_uid"];
             $sent->acceptor_uid = null;
@@ -542,13 +542,13 @@ class SentenceController extends Controller
             $this->saveHistory(
                 $sent->uid,
                 $realEditor,
-                $request->get('content'),
+                $request->input('content'),
                 $user["user_uid"],
                 null,
-                $request->get('prUuid'),
+                $request->input('prUuid'),
             );
         } else {
-            $this->saveHistory($sent->uid, $realEditor, $request->get('content'));
+            $this->saveHistory($sent->uid, $realEditor, $request->input('content'));
         }
 
         Mq::publish('progress', [

api-v12/app/Http/Controllers/SentenceIOController.php

@@ -16,29 +16,38 @@ class SentenceIOController extends Controller
     public function index(Request $request)
     {
         //
-        $table = Sentence::select(['uid','book_id','paragraph',
-                                    'word_start','word_end',
-                                    'content','content_type',
-                                    'channel_uid','editor_uid','language',
-                                    'updated_at','created_at']);
-        switch ($request->get('view')) {
+        $table = Sentence::select([
+            'uid',
+            'book_id',
+            'paragraph',
+            'word_start',
+            'word_end',
+            'content',
+            'content_type',
+            'channel_uid',
+            'editor_uid',
+            'language',
+            'updated_at',
+            'created_at'
+        ]);
+        switch ($request->input('view')) {
             case 'public':
-                $channels = Channel::where('status',30)
-                                ->where('type',$request->get('type','translation'))
-                                ->select('uid')->get();
-                $table->whereIn('channel_uid',$channels)
-                      ->where('updated_at','>',$request->get('updated_at','2000-1-1'));
-            break;
+                $channels = Channel::where('status', 30)
+                    ->where('type', $request->input('type', 'translation'))
+                    ->select('uid')->get();
+                $table->whereIn('channel_uid', $channels)
+                    ->where('updated_at', '>', $request->input('updated_at', '2000-1-1'));
+                break;
         }
         $count = $table->count();
         //处理排序
-        $table->orderBy('updated_at','asc');
+        $table->orderBy('updated_at', 'asc');
         //处理分页
-        $table->skip($request->get("offset",0))
-              ->take($request->get("limit",200));
+        $table->skip($request->input("offset", 0))
+            ->take($request->input("limit", 200));
         //获取数据
         $result = $table->get();
-        return $this->ok(["rows"=>$result,"count"=>$count]);
+        return $this->ok(["rows" => $result, "count" => $count]);
     }
 
     /**

api-v12/app/Http/Controllers/SentenceInfoController.php

@@ -34,10 +34,10 @@ class SentenceInfoController extends Controller
 
     private function getSentProgress(Request $request, $date = '')
     {
-        $channel = $request->get('channel');
-        $from = $request->get('from');
+        $channel = $request->input('channel');
+        $from = $request->input('from');
         if ($request->has('to')) {
-            $to = $request->get('to');
+            $to = $request->input('to');
         } else {
             $to = $this->_endParagraph;
         }
@@ -50,30 +50,30 @@ class SentenceInfoController extends Controller
         # percent
         $view = 'strlen';
         if ($request->has('view')) {
-            $view = $request->get('view');
+            $view = $request->input('view');
         } else if ($request->has('type')) {
-            $view = $request->get('type');
+            $view = $request->input('type');
         }
 
 
         #一页书中的字符数
         $pageStrLen = 2000;
         if ($request->has('strlen')) {
-            $pageStrLen = $request->get('strlen');
+            $pageStrLen = $request->input('strlen');
         }
         if ($request->has('pagelen')) {
-            $pageStrLen = $request->get('pagelen');
+            $pageStrLen = $request->input('pagelen');
         }
 
         # 页数
         $pageNumber = 300;
         if ($request->has('pages')) {
-            $pageNumber = $request->get('pages');
+            $pageNumber = $request->input('pages');
         }
 
-        $db = Sentence::where('sentences.channel_uid', $request->get('channel'))
-            ->where('sentences.book_id', '>=', $request->get('book'))
-            ->where('sentences.paragraph', '>=', $request->get('from'))
+        $db = Sentence::where('sentences.channel_uid', $request->input('channel'))
+            ->where('sentences.book_id', '>=', $request->input('book'))
+            ->where('sentences.paragraph', '>=', $request->input('from'))
             ->where('sentences.paragraph', '<=', $to);
         if ($view === "palistrlen") {
             $db = $db->leftJoin('pali_texts', function ($join) {
@@ -94,20 +94,20 @@ class SentenceInfoController extends Controller
         }
         #计算已完成百分比
         $percent = 0;
-        if (($view === 'page' && !empty($request->get('pages'))) || $view === 'percent') {
+        if (($view === 'page' && !empty($request->input('pages'))) || $view === 'percent') {
             #计算完成的句子在巴利语句子表中的字符串长度百分比
             $db = Sentence::select(['book_id', 'paragraph', 'word_start', 'word_end'])
-                ->where('channel_uid', $request->get('channel'))
-                ->where('book_id', '>=', $request->get('book'))
-                ->where('paragraph', '>=', $request->get('from'))
+                ->where('channel_uid', $request->input('channel'))
+                ->where('book_id', '>=', $request->input('book'))
+                ->where('paragraph', '>=', $request->input('from'))
                 ->where('paragraph', '<=', $to);
             if (!empty($date)) {
                 $db = $db->whereDate('created_at', '=', $date);
             }
             $sentFinished = $db->get();
             #查询这些句子的总共等效巴利语字符数
-            $allStrLen = PaliSentence::where('book', $request->get('book'))
-                ->where('paragraph', '>=', $request->get('from'))
+            $allStrLen = PaliSentence::where('book', $request->input('book'))
+                ->where('paragraph', '>=', $request->input('from'))
                 ->where('paragraph', '<=', $to)
                 ->sum('length');
             $para_strlen = 0;
@@ -133,9 +133,9 @@ class SentenceInfoController extends Controller
         switch ($view) {
             case 'page':
                 # 输出已经完成的页数
-                if (!empty($request->get('pages'))) {
+                if (!empty($request->input('pages'))) {
                     #给了页码，用百分比计算
-                    $resulte = $percent * $request->get('pages');
+                    $resulte = $percent * $request->input('pages');
                 } else {
                     #没给页码，用每页字符数计算
                     $resulte = $strlen / $pageStrLen;
@@ -167,7 +167,7 @@ class SentenceInfoController extends Controller
         $resulte = $this->getSentProgress($request);
         $svg = "<svg  xmlns='http://www.w3.org/2000/svg'  xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 100 25'>";
 
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'percent':
                 # code...
                 $resulte = $resulte * 100;
@@ -211,10 +211,10 @@ class SentenceInfoController extends Controller
         # percent
         $view = 'strlen';
         if ($request->has('view')) {
-            $view = $request->get('view');
+            $view = $request->input('view');
         }
         if ($request->has('type')) {
-            $view = $request->get('type');
+            $view = $request->input('type');
         }
 
 
@@ -224,12 +224,12 @@ class SentenceInfoController extends Controller
 
         ob_clean();
         ob_start();
-        $channel = $request->get('channel');
-        $from = $request->get('from');
+        $channel = $request->input('channel');
+        $from = $request->input('from');
         if ($request->has('to')) {
-            $to = $request->get('to');
+            $to = $request->input('to');
         } else {
-            $chapterLen = PaliText::where('book', $request->get('book'))->where('paragraph', $from)->value('chapter_len');
+            $chapterLen = PaliText::where('book', $request->input('book'))->where('paragraph', $from)->value('chapter_len');
             $to =  $from + $chapterLen - 1;
             $this->_endParagraph = $to;
         }
@@ -360,11 +360,11 @@ class SentenceInfoController extends Controller
     public function show(Request $request, string $sentenceId)
     {
         //
-        $sentence = Sentence::where('book_id', $request->get('book'))
-            ->where('paragraph', $request->get('par'))
-            ->where('word_start', $request->get('start'))
-            ->where('word_end', $request->get('end'))
-            ->where('channel_uid', $request->get('channel'))
+        $sentence = Sentence::where('book_id', $request->input('book'))
+            ->where('paragraph', $request->input('par'))
+            ->where('word_start', $request->input('start'))
+            ->where('word_end', $request->input('end'))
+            ->where('channel_uid', $request->input('channel'))
             ->firstOrFail();
         return $this->ok(new SentResource($sentence));
     }

api-v12/app/Http/Controllers/SentencesInChapterController.php

@@ -1,7 +1,9 @@
 <?php
+
 /**
  * 输出某章节的句子列表。算法跟随章节显示功能
  */
+
 namespace App\Http\Controllers;
 
 use App\Models\PaliText;
@@ -18,57 +20,57 @@ class SentencesInChapterController extends Controller
     public function index(Request $request)
     {
         //
-        $book = $request->get('book');
-        $para = $request->get('para');
-        $chapter = PaliText::where('book',$book)
-                           ->where('paragraph',$para)
-                           ->first();
-        if(!$chapter){
+        $book = $request->input('book');
+        $para = $request->input('para');
+        $chapter = PaliText::where('book', $book)
+            ->where('paragraph', $para)
+            ->first();
+        if (!$chapter) {
             return $this->error("no chapter data");
         }
         $paraFrom = $para;
-        $paraTo = $para+$chapter->chapter_len-1;
+        $paraTo = $para + $chapter->chapter_len - 1;
 
         //1. 计算 标题和下一级第一个标题之间 是否有间隔
-        $nextChapter =  PaliText::where('book',$book)
-                        ->where('paragraph',">",$para)
-                        ->where('level','<',8)
-                        ->orderBy('paragraph')
-                        ->value('paragraph');
+        $nextChapter =  PaliText::where('book', $book)
+            ->where('paragraph', ">", $para)
+            ->where('level', '<', 8)
+            ->orderBy('paragraph')
+            ->value('paragraph');
         $between = $nextChapter - $para;
         //查找子目录
         $chapterLen = $chapter->chapter_len;
-        $toc = PaliText::where('book',$book)
-                ->whereBetween('paragraph',[$paraFrom+1,$paraFrom+$chapterLen-1])
-                ->where('level','<',8)
-                ->orderBy('paragraph')
-                ->select(['book','paragraph','level','toc'])
-                ->get();
+        $toc = PaliText::where('book', $book)
+            ->whereBetween('paragraph', [$paraFrom + 1, $paraFrom + $chapterLen - 1])
+            ->where('level', '<', 8)
+            ->orderBy('paragraph')
+            ->select(['book', 'paragraph', 'level', 'toc'])
+            ->get();
 
-        if($between > 1){
-        //有间隔
+        if ($between > 1) {
+            //有间隔
             $paraTo = $nextChapter - 1;
-        }else{
-            if($chapter->chapter_strlen>2000){
-                if(count($toc)>0){
+        } else {
+            if ($chapter->chapter_strlen > 2000) {
+                if (count($toc) > 0) {
                     //有子目录只输出标题和目录
                     $paraTo = $paraFrom;
-                }else{
+                } else {
                     //没有子目录 全部输出
                 }
-            }else{
+            } else {
                 //章节小。全部输出 不输出子目录
                 $toc = [];
             }
         }
 
-        $sent = PaliSentence::where('book',$book)
-                            ->whereBetween('paragraph',[$paraFrom,$paraTo])
-                            ->select(['book','paragraph','word_begin','word_end'])
-                            ->orderBy('paragraph')
-                            ->orderBy('word_begin')
-                            ->get();
-        return $this->ok(['rows'=>$sent,'count'=>count($sent)]);
+        $sent = PaliSentence::where('book', $book)
+            ->whereBetween('paragraph', [$paraFrom, $paraTo])
+            ->select(['book', 'paragraph', 'word_begin', 'word_end'])
+            ->orderBy('paragraph')
+            ->orderBy('word_begin')
+            ->get();
+        return $this->ok(['rows' => $sent, 'count' => count($sent)]);
     }
 
     /**

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

@@ -24,13 +24,13 @@ class ShareController extends Controller
         $result = false;
         $role = "member";
         $indexCol = ['id', 'res_id', 'res_type', 'power', 'updated_at', 'created_at'];
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'res':
                 if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
-                $table = Share::where('res_id', $request->get('id'));
-                $power = ShareApi::getResPower($user['user_uid'], $request->get('id'), $table->value('res_type'));
+                $table = Share::where('res_id', $request->input('id'));
+                $power = ShareApi::getResPower($user['user_uid'], $request->input('id'), $table->value('res_type'));
                 switch ($power) {
                     case 10:
                         $role = "member";
@@ -48,10 +48,10 @@ class ShareController extends Controller
                     return $this->error(__('auth.failed'));
                 }
                 //TODO 判断当前用户是否有指定的 group 的权限
-                if (GroupInfo::where('uid', $request->get('id'))->where('owner', $user['user_uid'])->exists()) {
+                if (GroupInfo::where('uid', $request->input('id'))->where('owner', $user['user_uid'])->exists()) {
                     $role = "owner";
                 }
-                $table = Share::where('cooperator_id', $request->get('id'));
+                $table = Share::where('cooperator_id', $request->input('id'));
                 break;
         }
         if (isset($_GET["search"])) {
@@ -65,8 +65,8 @@ class ShareController extends Controller
             $table = $table->orderBy('updated_at', 'desc');
         }
 
-        $table->skip($request->get('offset', 0))
-            ->take($request->get('limit', 1000));
+        $table->skip($request->input('offset', 0))
+            ->take($request->input('limit', 1000));
 
         $result = $table->get();
         //TODO 获取当前用户的身份
@@ -88,23 +88,23 @@ class ShareController extends Controller
     public function store(Request $request)
     {
         //
-        foreach ($request->get('user_id') as $key => $value) {
+        foreach ($request->input('user_id') as $key => $value) {
             if (!Str::isUuid($value)) {
                 continue;
             }
             $row = Share::where('cooperator_id', $value)
-                ->where('res_id', $request->get('res_id'))->first();
+                ->where('res_id', $request->input('res_id'))->first();
             if (!$row) {
                 $row = new Share();
                 $row->id = app('snowflake')->id();
                 $row->cooperator_id = $value;
-                $row->res_id = $request->get('res_id');
-                $row->res_type = $request->get('res_type');
+                $row->res_id = $request->input('res_id');
+                $row->res_type = $request->input('res_type');
                 $row->create_time = time() * 1000;
             }
             $c_type = ['user' => 0, 'group' => 1];
-            $row->cooperator_type = $c_type[$request->get('user_type')];
-            switch ($request->get('role')) {
+            $row->cooperator_type = $c_type[$request->input('user_type')];
+            switch ($request->input('role')) {
                 case 'manager':
                 case 'editor':
                     $row->power = 20;
@@ -116,7 +116,7 @@ class ShareController extends Controller
             $row->modify_time = time() * 1000;
             $row->save();
         }
-        return $this->ok(count($request->get('user_id')));
+        return $this->ok(count($request->input('user_id')));
     }
 
     /**
@@ -150,7 +150,7 @@ class ShareController extends Controller
             //普通成员没有删除权限
             return $this->error(__('auth.failed'));
         }
-        switch ($request->get('role')) {
+        switch ($request->input('role')) {
             case 'manager':
             case 'editor':
                 $share->power = 20;

api-v12/app/Http/Controllers/SignUpController.php

@@ -31,31 +31,31 @@ class SignUpController extends Controller
     public function store(Request $request)
     {
         //先查询invite核对uuid
-        if(!Invite::where('id',$request->get('token'))
-                  ->where('email',$request->get('email'))->exists()){
-            $this->error('error token','',200);
+        if (!Invite::where('id', $request->input('token'))
+            ->where('email', $request->input('email'))->exists()) {
+            $this->error('error token', '', 200);
         }
-        if(UserInfo::where('username',$request->get('name'))->exists()){
-            $this->error('avoid user name','',200);
+        if (UserInfo::where('username', $request->input('name'))->exists()) {
+            $this->error('avoid user name', '', 200);
         }
 
         try {
-            DB::transaction(function() use($request){
+            DB::transaction(function () use ($request) {
                 $user = new UserInfo;
                 $user->userid = Str::Uuid();
-                $user->username = $request->get('username');
-                $user->nickname = $request->get('nickname');
-                $user->email = $request->get('email');
-                $user->password = md5($request->get('password'));
+                $user->username = $request->input('username');
+                $user->nickname = $request->input('nickname');
+                $user->email = $request->input('email');
+                $user->password = md5($request->input('password'));
                 $user->role = json_encode(['basic']);
-                $user->create_time = time()*1000;
-                $user->modify_time = time()*1000;
+                $user->create_time = time() * 1000;
+                $user->modify_time = time() * 1000;
                 $user->save();
 
                 //标记invite
-                Invite::where('id',$request->get('token'))
-                        ->where('email',$request->get('email'))
-                        ->update(['status'=>'sign-up']);
+                Invite::where('id', $request->input('token'))
+                    ->where('email', $request->input('email'))
+                    ->update(['status' => 'sign-up']);
                 //建立channel
 
                 $channel_draft = new Channel;
@@ -63,16 +63,16 @@ class SignUpController extends Controller
                 $channel_draft->name = 'draft';
                 $channel_draft->owner_uid = $user->userid;
                 $channel_draft->type = "translation";
-                $channel_draft->lang = $request->get('lang');
+                $channel_draft->lang = $request->input('lang');
                 $channel_draft->status = 5;
                 $channel_draft->editor_id = $user->id;
-                $channel_draft->create_time = time()*1000;
-                $channel_draft->modify_time = time()*1000;
+                $channel_draft->create_time = time() * 1000;
+                $channel_draft->modify_time = time() * 1000;
                 $channel_draft->save();
             });
-        }catch(\Exception $e) {
-            Log::error('user create fail',['data'=>$e]);
-            return $this->error('user create fail',500,500);
+        } catch (\Exception $e) {
+            Log::error('user create fail', ['data' => $e]);
+            return $this->error('user create fail', 500, 500);
         }
         return $this->ok('ok');
     }
@@ -83,16 +83,16 @@ class SignUpController extends Controller
      * @param  string $username
      * @return \Illuminate\Http\Response
      */
-    public function show(Request $request,string $username)
+    public function show(Request $request, string $username)
     {
         //
-        $email = UserInfo::where('email',$request->get('email'))->exists();
-        $user = UserInfo::where('username',$username)->exists();
-        if($email && $user){
+        $email = UserInfo::where('email', $request->input('email'))->exists();
+        $user = UserInfo::where('username', $username)->exists();
+        if ($email && $user) {
             //send email
             return $this->ok('ok');
-        }else{
-            return $this->error(['email'=>$email,'username'=>$user],[200],200);
+        } else {
+            return $this->error(['email' => $email, 'username' => $user], [200], 200);
         }
     }
 

api-v12/app/Http/Controllers/SnowFlakeIdController.php

@@ -15,10 +15,10 @@ class SnowFlakeIdController extends Controller
     {
         //
         $output = [];
-        for ($i=0 ; $i < $request->get('count',1)  ; $i++ ) {
+        for ($i = 0; $i < $request->input('count', 1); $i++) {
             $output[] = app('snowflake')->id();
         }
-        return $this->ok(['rows'=>$output,'count'=>count($output)]);
+        return $this->ok(['rows' => $output, 'count' => count($output)]);
     }
 
     /**

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

@@ -18,25 +18,25 @@ class StudioController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'collaboration-channel':
                 //协作channel 拥有者列表
-                $studioId = StudioApi::getIdByName($request->get('studio_name'));
-                $resList = ShareApi::getResList($studioId,2);
-                $resId=[];
+                $studioId = StudioApi::getIdByName($request->input('studio_name'));
+                $resList = ShareApi::getResList($studioId, 2);
+                $resId = [];
                 foreach ($resList as $res) {
                     $resId[] = $res['res_id'];
                 }
                 $owners = Channel::whereIn('uid', $resId)
-                                ->where('owner_uid','<>', $studioId)
-                                ->select('owner_uid')
-                                ->groupBy('owner_uid')->get();
+                    ->where('owner_uid', '<>', $studioId)
+                    ->select('owner_uid')
+                    ->groupBy('owner_uid')->get();
                 $output = [];
                 foreach ($owners as $key => $owner) {
                     # code...
                     $output[] = StudioApi::getById($owner->owner_uid);
                 }
-                return $this->ok(['rows'=>$output,'count'=>count($output)]);
+                return $this->ok(['rows' => $output, 'count' => count($output)]);
                 break;
         }
     }

api-v12/app/Http/Controllers/SuggestionController.php

@@ -16,10 +16,10 @@ class SuggestionController extends Controller
     public function index()
     {
         //
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'chapter':
-                $chapter = PaliTextApi::getChapterStartEnd($request->get('book'),$request->get('para'));
-                if(!$chapter){
+                $chapter = PaliTextApi::getChapterStartEnd($request->input('book'), $request->input('para'));
+                if (!$chapter) {
                     return $this->error("no data");
                 }
 

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

@@ -25,7 +25,7 @@ class SysModelController extends Controller
             Log::error('notification auth failed {request}', ['request' => $request]);
             return $this->error(__('auth.failed'), 401, 401);
         }
-        $modelsId = Cache::get($this->key . $request->get('view', 'wbw'));
+        $modelsId = Cache::get($this->key . $request->input('view', 'wbw'));
         if (!is_array($modelsId)) {
             $modelsId = [];
         }
@@ -54,8 +54,8 @@ class SysModelController extends Controller
             return $this->error(__('auth.failed'), 401, 401);
         }
         Cache::put(
-            $this->key . $request->get('view', 'wbw'),
-            $request->get('models')
+            $this->key . $request->input('view', 'wbw'),
+            $request->input('models')
         );
         return $this->ok('ok');
     }

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

@@ -23,31 +23,32 @@ class TagController extends Controller
     {
         //
 
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'studio':
-                $studioId = StudioApi::getIdByName($request->get('name'));
-                $table = Tag::where('owner_id',$studioId);
+                $studioId = StudioApi::getIdByName($request->input('name'));
+                $table = Tag::where('owner_id', $studioId);
                 break;
         }
 
-        if($request->has("search")){
-            $table = $table->where('name', 'like', "%".$request->get("search")."%");
+        if ($request->has("search")) {
+            $table = $table->where('name', 'like', "%" . $request->input("search") . "%");
         }
 
         $count = $table->count();
 
-        $table = $table->orderBy($request->get('order','created_at'),$request->get('dir','desc'));
+        $table = $table->orderBy($request->input('order', 'created_at'), $request->input('dir', 'desc'));
 
-        $table = $table->skip($request->get("offset",0))
-                    ->take($request->get('limit',10));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 10));
 
         $result = $table->get();
 
         return $this->ok(
             [
-            "rows"=>TagResource::collection($result),
-            "count"=>$count,
-            ]);
+                "rows" => TagResource::collection($result),
+                "count" => $count,
+            ]
+        );
     }
 
     /**
@@ -60,24 +61,25 @@ class TagController extends Controller
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error(__('auth.failed'),401,401);
+        if (!$user) {
+            return $this->error(__('auth.failed'), 401, 401);
         }
         //判断当前用户是否有指定的studio的权限
-        $studioId = StudioApi::getIdByName($request->get('studio'));
-        if($user['user_uid'] !== $studioId){
-            return $this->error(__('auth.failed'),403,403);
+        $studioId = StudioApi::getIdByName($request->input('studio'));
+        if ($user['user_uid'] !== $studioId) {
+            return $this->error(__('auth.failed'), 403, 403);
         }
         //查询是否重复
-        if(Tag::where('name',$request->get('name'))
-                  ->where('owner_id',$user['user_uid'])
-                  ->exists()){
-            return $this->error(__('validation.exists',['name']),200,200);
+        if (Tag::where('name', $request->input('name'))
+            ->where('owner_id', $user['user_uid'])
+            ->exists()
+        ) {
+            return $this->error(__('validation.exists', ['name']), 200, 200);
         }
         $tag = new Tag;
-        $tag->name = $request->get("name");
-        $tag->description = $request->get("description");
-        $tag->color = $request->get("color");
+        $tag->name = $request->input("name");
+        $tag->description = $request->input("description");
+        $tag->color = $request->input("color");
         $tag->owner_id = $studioId;
         $tag->save();
         return $this->ok(new TagResource($tag));
@@ -93,7 +95,6 @@ class TagController extends Controller
     {
         //
         return $this->ok(new TagResource($tag));
-
     }
 
     /**
@@ -107,25 +108,26 @@ class TagController extends Controller
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error(__('auth.failed'),401,401);
+        if (!$user) {
+            return $this->error(__('auth.failed'), 401, 401);
         }
         //判断当前用户是否有指定的studio的权限
-        $studioId = StudioApi::getIdByName($request->get('studio'));
-        if($user['user_uid'] !== $studioId){
-            return $this->error(__('auth.failed'),403,403);
+        $studioId = StudioApi::getIdByName($request->input('studio'));
+        if ($user['user_uid'] !== $studioId) {
+            return $this->error(__('auth.failed'), 403, 403);
         }
         //查询是否重复
-        if(Tag::where('name',$request->get('name'))
-                  ->where('owner_id',$user['user_uid'])
-                  ->where('id','<>',$tag->id)
-                  ->exists()){
-            return $this->error(__('validation.exists',['name']),200,200);
+        if (Tag::where('name', $request->input('name'))
+            ->where('owner_id', $user['user_uid'])
+            ->where('id', '<>', $tag->id)
+            ->exists()
+        ) {
+            return $this->error(__('validation.exists', ['name']), 200, 200);
         }
 
-        $tag->name = $request->get("name");
-        $tag->description = $request->get("description");
-        $tag->color = $request->get("color");
+        $tag->name = $request->input("name");
+        $tag->description = $request->input("description");
+        $tag->color = $request->input("color");
         $tag->owner_id = $studioId;
         $tag->save();
         return $this->ok(new TagResource($tag));

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

@@ -22,44 +22,56 @@ class TagMapController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'items':
-                $table = TagMap::where('tag_id',$request->get('tag_id'));
+                $table = TagMap::where('tag_id', $request->input('tag_id'));
                 break;
             case 'item':
-                $studioId = StudioApi::getIdByName($request->get('studio'));
-                $table = TagMap::where('owner_uid',$studioId)
-                               ->where('anchor_id',$request->get('res_id'))
-                               ->leftJoin('tags','tag_maps.tag_id', '=', 'tags.id')
-                               ->select(['tag_maps.id','table_name','anchor_id',
-                                        'tag_id','tags.name','tags.color','tags.description',
-                                    'owner_uid','editor_uid','tag_maps.created_at','tag_maps.updated_at']);
+                $studioId = StudioApi::getIdByName($request->input('studio'));
+                $table = TagMap::where('owner_uid', $studioId)
+                    ->where('anchor_id', $request->input('res_id'))
+                    ->leftJoin('tags', 'tag_maps.tag_id', '=', 'tags.id')
+                    ->select([
+                        'tag_maps.id',
+                        'table_name',
+                        'anchor_id',
+                        'tag_id',
+                        'tags.name',
+                        'tags.color',
+                        'tags.description',
+                        'owner_uid',
+                        'editor_uid',
+                        'tag_maps.created_at',
+                        'tag_maps.updated_at'
+                    ]);
                 break;
         }
 
         $count = $table->count();
 
-        $table = $table->orderBy($request->get('order','created_at'),$request->get('dir','desc'));
+        $table = $table->orderBy($request->input('order', 'created_at'), $request->input('dir', 'desc'));
 
-        $table = $table->skip($request->get("offset",0))
-                    ->take($request->get('limit',10));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 10));
 
         $result = $table->get();
 
         return $this->ok(
             [
-            "rows"=>TagMapResource::collection($result),
-            "count"=>$count,
-            ]);
+                "rows" => TagMapResource::collection($result),
+                "count" => $count,
+            ]
+        );
     }
 
-    public function userCanManage($userId,$ownerId,$courseId=null){
-        if($userId === $ownerId){
+    public function userCanManage($userId, $ownerId, $courseId = null)
+    {
+        if ($userId === $ownerId) {
             return true;
         }
-        if(!empty($courseId)){
-            $role = CourseApi::role($courseId,$userId);
-            if(!empty($role) && $role !== 'student'){
+        if (!empty($courseId)) {
+            $role = CourseApi::role($courseId, $userId);
+            if (!empty($role) && $role !== 'student') {
                 return true;
             }
         }
@@ -75,45 +87,47 @@ class TagMapController extends Controller
     public function store(Request $request)
     {
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error(__('auth.failed'),401,401);
+        if (!$user) {
+            return $this->error(__('auth.failed'), 401, 401);
         }
         //判断当前用户是否有指定的studio的权限
-        $studioId = StudioApi::getIdByName($request->get('studio'));
-        if($this->userCanManage($user['user_uid'],
-                                $studioId,
-                                $request->get('course')) ===false){
-            return $this->error(__('auth.failed'),403,403);
+        $studioId = StudioApi::getIdByName($request->input('studio'));
+        if ($this->userCanManage(
+            $user['user_uid'],
+            $studioId,
+            $request->input('course')
+        ) === false) {
+            return $this->error(__('auth.failed'), 403, 403);
         }
 
         //查询是否重复
-        if(TagMap::where('anchor_id',$request->get('anchor_id'))
-                  ->where('tag_id',$request->get('tag_id'))
-                  ->where('owner_uid',$studioId)
-                  ->exists()){
-            return $this->error(__('validation.exists',['name']),200,200);
+        if (TagMap::where('anchor_id', $request->input('anchor_id'))
+            ->where('tag_id', $request->input('tag_id'))
+            ->where('owner_uid', $studioId)
+            ->exists()
+        ) {
+            return $this->error(__('validation.exists', ['name']), 200, 200);
         }
         $tag = new TagMap;
         $tag->id = Str::uuid();
-        $tag->table_name = $request->get("table_name");
-        $tag->anchor_id = $request->get("anchor_id");
-        $tag->tag_id = $request->get("tag_id");
+        $tag->table_name = $request->input("table_name");
+        $tag->anchor_id = $request->input("anchor_id");
+        $tag->tag_id = $request->input("tag_id");
         $tag->editor_uid = $user['user_uid'];
         $tag->owner_uid = $studioId;
         $tag->save();
 
-        $tagsMap = TagMap::where('anchor_id',$request->get("anchor_id"))
-                    ->where('owner_uid',$studioId)
-                    ->select('tag_id')
-                    ->get();
+        $tagsMap = TagMap::where('anchor_id', $request->input("anchor_id"))
+            ->where('owner_uid', $studioId)
+            ->select('tag_id')
+            ->get();
 
         return $this->ok(
             [
-            "rows"=>TagMapResource::collection($tagsMap),
-            "count"=>count($tagsMap),
+                "rows" => TagMapResource::collection($tagsMap),
+                "count" => count($tagsMap),
             ]
         );
-
     }
 
     /**
@@ -148,14 +162,16 @@ class TagMapController extends Controller
     public function destroy(Request $request, TagMap $tagMap)
     {
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
         //判断当前用户是否有指定的studio的权限
-        if($this->userCanManage($user['user_uid'],
-                                $tagMap->owner_uid,
-                                $request->get('course')) ===false){
-            return $this->error(__('auth.failed'),403,403);
+        if ($this->userCanManage(
+            $user['user_uid'],
+            $tagMap->owner_uid,
+            $request->input('course')
+        ) === false) {
+            return $this->error(__('auth.failed'), 403, 403);
         }
         $delete = $tagMap->delete();
 

api-v12/app/Http/Controllers/TagsInChapterCountController.php

@@ -18,57 +18,57 @@ class TagsInChapterCountController extends Controller
      */
     public function index()
     {
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case "chapter":
-                $progress = $request->get('progress',0.8);
-                $lang = $request->get('lang');
-                $channelType = $request->get('type','translation');
+                $progress = $request->input('progress', 0.8);
+                $lang = $request->input('lang');
+                $channelType = $request->input('type', 'translation');
 
                 $tm = (new TagMap)->getTable();
-                $pc =(new ProgressChapter)->getTable();
+                $pc = (new ProgressChapter)->getTable();
                 $tg = (new Tag)->getTable();
 
                 //标签过滤
-                if($request->get('tags') && $request->get('tags')!==''){
-                    $tags = explode(',',$request->get('tags'));
+                if ($request->input('tags') && $request->input('tags') !== '') {
+                    $tags = explode(',', $request->input('tags'));
                     foreach ($tags as $tag) {
                         # code...
-                        if(!empty($tag)){
+                        if (!empty($tag)) {
                             $tagNames[] = $tag;
                         }
                     }
                 }
-                if(isset($tagNames)){
-                    $where1 = " where co = ".count($tagNames);
-                    $a = implode(",",array_fill(0, count($tagNames), '?')) ;
+                if (isset($tagNames)) {
+                    $where1 = " where co = " . count($tagNames);
+                    $a = implode(",", array_fill(0, count($tagNames), '?'));
                     $in1 = "and t.name in ({$a})";
                     $param = $tagNames;
-                }else{
+                } else {
                     $where1 = " ";
                     $in1 = " ";
                 }
-                if(Str::isUuid($request->get('channel'))){
-                    $channel = "and channel_id = '".$request->get('channel')."' ";
-                }else{
+                if (Str::isUuid($request->input('channel'))) {
+                    $channel = "and channel_id = '" . $request->input('channel') . "' ";
+                } else {
                     $channel = "";
                 }
                 //完成度过滤
                 $param[] = $progress;
 
                 //语言过滤
-                if(!empty($request->get('lang'))){
+                if (!empty($request->input('lang'))) {
                     $whereLang = " and pc.lang = ? ";
-                    $param[] = $request->get('lang');
-                }else{
+                    $param[] = $request->input('lang');
+                } else {
                     $whereLang = "   ";
                 }
                 //channel type过滤
-				if($request->has('channel_type') && !empty($request->get('channel_type'))){
-					$channel_type = "and ch.type = ? ";
-					$param[] = $request->get('channel_type');
-				}else{
-					$channel_type = "";
-				}
+                if ($request->has('channel_type') && !empty($request->input('channel_type'))) {
+                    $channel_type = "and ch.type = ? ";
+                    $param[] = $request->input('channel_type');
+                } else {
+                    $channel_type = "";
+                }
 
                 $param_count = $param;
 
@@ -102,8 +102,8 @@ class TagsInChapterCountController extends Controller
 				) TID
 				left join tags t2 on t2.id = TID.tag_id
 				order by count desc";
-                $result = DB::select($query,$param);
-                return $this->ok(['rows'=>$result,'count'=>count($result)]);
+                $result = DB::select($query, $param);
+                return $this->ok(['rows' => $result, 'count' => count($result)]);
                 break;
         }
     }

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

@@ -32,7 +32,7 @@ class TaskController extends Controller
             return $this->error(__('auth.failed'), 401, 401);
         }
 
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'all':
                 $table = Task::whereNotNull('owner_id');
                 break;
@@ -43,8 +43,8 @@ class TaskController extends Controller
                 $table = Task::where('owner_id', $user['user_uid']);
                 break;
             case 'project':
-                $projects = Project::where('uid', $request->get('project_id'))
-                    ->orWhereJsonContains('path', $request->get('project_id'))
+                $projects = Project::where('uid', $request->input('project_id'))
+                    ->orWhereJsonContains('path', $request->input('project_id'))
                     ->select('uid')
                     ->get();
                 $table = Task::whereIn('project_id', $projects);
@@ -56,23 +56,23 @@ class TaskController extends Controller
         if ($request->has('executor_id_includes')) {
             $table = $table->whereIn(
                 'executor_id',
-                explode(',', $request->get('executor_id_includes'))
+                explode(',', $request->input('executor_id_includes'))
             );
         }
         if ($request->has('executor_id_not-includes')) {
             $table = $table->whereNotIn(
                 'executor_id',
-                explode(',', $request->get('executor_id_not-includes'))
+                explode(',', $request->input('executor_id_not-includes'))
             );
         }
         if ($request->has('assignees_id_includes')) {
-            $assigneesId = explode(',', $request->get('assignees_id_includes'));
+            $assigneesId = explode(',', $request->input('assignees_id_includes'));
             $assigneesTasks = TaskAssignee::whereIn('assignee_id', $assigneesId)
                 ->select('task_id')->get();
             $table = $table->whereIn('id', $assigneesTasks);
         }
         if ($request->has('assignees_id_not-includes')) {
-            $assigneesId = explode(',', $request->get('assignees_id_includes'));
+            $assigneesId = explode(',', $request->input('assignees_id_includes'));
             $assigneesTasks = TaskAssignee::whereIn('assignee_id', $assigneesId)
                 ->select('task_id')->get();
             $table = $table->whereNotIn('id', $assigneesTasks);
@@ -85,13 +85,13 @@ class TaskController extends Controller
             $table = $table->has('task_assignees');
         }
 
-        if ($request->get('sign_up_equals') === 'true') {
+        if ($request->input('sign_up_equals') === 'true') {
             $table = $table->whereNull('assignees_id')
                 ->whereNull('executor_id');
         }
         /**某人参与的 */
         if ($request->has('participants_id_includes')) {
-            $id = explode(',', $request->get('participants_id_includes'));
+            $id = explode(',', $request->input('participants_id_includes'));
             $tasks_id = TaskAssignee::whereIn('assignee_id', $id)->select('task_id')->get();
             $table = $table->where(function ($query) use ($id, $tasks_id) {
                 $query->whereIn('executor_id', $id)
@@ -100,7 +100,7 @@ class TaskController extends Controller
         }
 
         if ($request->has('participants_id_not-includes')) {
-            $id = explode(',', $request->get('participants_id_includes'));
+            $id = explode(',', $request->input('participants_id_includes'));
             $tasks_id = TaskAssignee::whereIn('assignee_id', $id)->select('task_id')->get();
             $table = $table->where(function ($query) use ($id, $tasks_id) {
                 $query->whereNotIn('executor_id', $id)
@@ -109,20 +109,20 @@ class TaskController extends Controller
         }
 
         if ($request->has('keyword')) {
-            $table = $table->where('title', 'like', '%' . $request->get('keyword') . '%');
+            $table = $table->where('title', 'like', '%' . $request->input('keyword') . '%');
         }
-        if ($request->has('status') && $request->get('status') !== 'all') {
-            $table = $table->whereIn('status', explode(',', $request->get('status')));
+        if ($request->has('status') && $request->input('status') !== 'all') {
+            $table = $table->whereIn('status', explode(',', $request->input('status')));
         }
         $count = $table->count();
 
         $table = $table->orderBy(
-            $request->get('order', 'created_at'),
-            $request->get('dir', 'asc')
+            $request->input('order', 'created_at'),
+            $request->input('dir', 'asc')
         );
 
-        $table = $table->skip($request->get("offset", 0))
-            ->take($request->get('limit', 1000));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 1000));
 
         Log::debug('sql', ['sql' => $table->toSql()]);
 
@@ -149,37 +149,37 @@ class TaskController extends Controller
         if (!$user) {
             return $this->error(__('auth.failed'), 401, 401);
         }
-        $studioId = StudioApi::getIdByName($request->get('studio_name'));
+        $studioId = StudioApi::getIdByName($request->input('studio_name'));
 
         if (!self::canEdit($user['user_uid'], $studioId)) {
             return $this->error(__('auth.failed'), 403, 403);
         }
         $new = Task::firstOrNew(
             [
-                'id' => $request->get('id')
+                'id' => $request->input('id')
             ],
             [
                 'owner_id' => $studioId,
                 'creator_id' => $user['user_uid'],
-                'project_id' => $request->get('project_id'),
+                'project_id' => $request->input('project_id'),
             ],
         );
 
-        if (Str::isUuid($request->get('id'))) {
-            $new->id = $request->get('id');
+        if (Str::isUuid($request->input('id'))) {
+            $new->id = $request->input('id');
         } else {
             $new->id =  Str::uuid();
         }
-        $new->title = $request->get('title');
+        $new->title = $request->input('title');
         $new->editor_id = $user['user_uid'];
-        $new->parent_id = $request->get('parent_id');
-        $new->type = $request->get('type');
+        $new->parent_id = $request->input('parent_id');
+        $new->type = $request->input('type');
         //处理任务顺序
-        if ($request->get('parent_id')) {
-            $maxOrder = Task::where('parent_id', $request->get('parent_id'))
+        if ($request->input('parent_id')) {
+            $maxOrder = Task::where('parent_id', $request->input('parent_id'))
                 ->max('order');
         } else {
-            $maxOrder = Task::where('project_id', $request->get('project_id'))
+            $maxOrder = Task::where('project_id', $request->input('project_id'))
                 ->max('order');
         }
         if ($maxOrder === null) {
@@ -222,21 +222,21 @@ class TaskController extends Controller
             return $this->error(__('auth.failed'), 403, 403);
         }
         if ($request->has('title')) {
-            $task->title = $request->get('title');
+            $task->title = $request->input('title');
         }
         if ($request->has('description')) {
-            $task->description = $request->get('description');
+            $task->description = $request->input('description');
         }
         if ($request->has('category')) {
-            $task->category = $request->get('category');
+            $task->category = $request->input('category');
         }
         if ($request->has('progress')) {
-            $task->progress = $request->get('progress');
+            $task->progress = $request->input('progress');
         }
         if ($request->has('assignees_id')) {
             $delete = TaskAssignee::where('task_id', $task->id)->delete();
             $assigneesData = [];
-            foreach ($request->get('assignees_id') as $key => $id) {
+            foreach ($request->input('assignees_id') as $key => $id) {
                 $assigneesData[] = [
                     'id' => Str::uuid(),
                     'task_id' => $task->id,
@@ -247,21 +247,21 @@ class TaskController extends Controller
             TaskAssignee::insert($assigneesData);
         }
         if ($request->has('roles')) {
-            $task->roles = json_encode($request->get('roles'), JSON_UNESCAPED_UNICODE);
+            $task->roles = json_encode($request->input('roles'), JSON_UNESCAPED_UNICODE);
         }
         if ($request->has('executor_id')) {
-            $task->executor_id = $request->get('executor_id');
+            $task->executor_id = $request->input('executor_id');
         }
         if ($request->has('executor_relation_task_id')) {
-            $task->executor_relation_task_id = $request->get('executor_relation_task_id');
+            $task->executor_relation_task_id = $request->input('executor_relation_task_id');
         }
         if ($request->has('project_id')) {
-            $task->project_id = $request->get('project_id');
+            $task->project_id = $request->input('project_id');
         }
         if ($request->has('pre_task_id')) {
             TaskApi::setRelationTasks(
                 $task->id,
-                explode(',', $request->get('pre_task_id')),
+                explode(',', $request->input('pre_task_id')),
                 $user['user_uid'],
                 'pre'
             );
@@ -269,16 +269,16 @@ class TaskController extends Controller
         if ($request->has('next_task_id')) {
             TaskApi::setRelationTasks(
                 $task->id,
-                explode(',', $request->get('next_task_id')),
+                explode(',', $request->input('next_task_id')),
                 $user['user_uid'],
                 'next'
             );
         }
         if ($request->has('is_milestone')) {
-            $task->is_milestone = $request->get('is_milestone');
+            $task->is_milestone = $request->input('is_milestone');
         }
         if ($request->has('order')) {
-            $task->order = $request->get('order');
+            $task->order = $request->input('order');
         }
 
         $task->editor_id = $user['user_uid'];

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

@@ -42,7 +42,7 @@ class TaskGroupController extends Controller
             return $this->error(__('auth.failed'), 401, 401);
         }
         //获取全部的project_id
-        $input = $request->get(key: 'data');
+        $input = $request->input(key: 'data');
         $id = [];
         foreach ($input as $key => $value) {
             $id[$value['project_id']] = 1;

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

@@ -97,7 +97,7 @@ class TaskStatusController extends Controller
             return $this->error('no status', 400, 400);
         }
 
-        $task->status = $request->get('status');
+        $task->status = $request->input('status');
         $task->editor_id = $user['user_uid'];
         $task->save();
         if ($task->type === 'workflow') {
@@ -108,7 +108,7 @@ class TaskStatusController extends Controller
                 ]
             );
         }
-        switch ($request->get('status')) {
+        switch ($request->input('status')) {
             case 'published':
                 $this->pushChange('published', $id);
                 # 开启子任务

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

@@ -26,19 +26,19 @@ class TermExportController extends Controller
     public function index(Request $request)
     {
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
-//TODO 判断是否有导出权限
-        switch ($request->get("view")) {
+        //TODO 判断是否有导出权限
+        switch ($request->input("view")) {
             case 'channel':
                 # code...
-                $rows = DhammaTerm::where('channal',$request->get("id"))->cursor();
+                $rows = DhammaTerm::where('channal', $request->input("id"))->cursor();
                 break;
             case 'studio':
                 # code...
-                $studioId = StudioApi::getIdByName($request->get("name"));
-                $rows = DhammaTerm::where('owner',$studioId)->cursor();
+                $studioId = StudioApi::getIdByName($request->input("name"));
+                $rows = DhammaTerm::where('owner', $studioId)->cursor();
                 break;
             default:
                 $this->error('no view');
@@ -74,10 +74,10 @@ class TermExportController extends Controller
         $filename = storage_path("app/tmp/{$fId}");
         $writer->save($filename);
         $key = "download/tmp/{$fId}";
-        Redis::set($key,file_get_contents($filename));
-        Redis::expire($key,300);
+        Redis::set($key, file_get_contents($filename));
+        Redis::expire($key, 300);
         unlink($filename);
-        return $this->ok(['uuid'=>$fId,'filename'=>"term.xlsx",'type'=>"application/vnd.ms-excel"]);
+        return $this->ok(['uuid' => $fId, 'filename' => "term.xlsx", 'type' => "application/vnd.ms-excel"]);
     }
 
     /**
@@ -102,52 +102,53 @@ class TermExportController extends Controller
         header('Content-Type: application/vnd.ms-excel');
         header('Content-Disposition: attachment; filename="term.xlsx"');
         $content = Redis::get("download/tmp/{$downloadId}");
-        file_put_contents("php://output",$content);
+        file_put_contents("php://output", $content);
     }
 
-    public function import(Request $request){
+    public function import(Request $request)
+    {
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error(__('auth.failed'),401,401);
+        if (!$user) {
+            return $this->error(__('auth.failed'), 401, 401);
         }
         /**
          * 判断是否有权限
          */
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'channel':
                 # 向channel里面导入，忽略源数据的channel id 和 owner 都设置为这个channel 的
-                $channel = ChannelApi::getById($request->get('id'));
+                $channel = ChannelApi::getById($request->input('id'));
                 $owner_id = $channel['studio_id'];
-                if($owner_id !== $user["user_uid"]){
+                if ($owner_id !== $user["user_uid"]) {
                     //判断是否为协作
-                    $power = ShareApi::getResPower($user["user_uid"],$request->get('id'));
-                    if($power<20){
-                        return $this->error(__('auth.failed'),403,403);
+                    $power = ShareApi::getResPower($user["user_uid"], $request->input('id'));
+                    if ($power < 20) {
+                        return $this->error(__('auth.failed'), 403, 403);
                     }
                 }
                 $language = $channel['lang'];
                 break;
             case 'studio':
                 # 向 studio 里面导入，忽略源数据的 owner 但是要检测 channel id 是否有权限
-                $owner_id = StudioApi::getIdByName($request->get('name'));
-                if(!$owner_id){
-                    return $this->error('no studio name',403,403);
+                $owner_id = StudioApi::getIdByName($request->input('name'));
+                if (!$owner_id) {
+                    return $this->error('no studio name', 403, 403);
                 }
 
                 break;
         }
 
         $message = "";
-        $filename = $request->get('filename');
-        if(Storage::missing($filename)){
-            return $this->error('no file '.$filename);
+        $filename = $request->input('filename');
+        if (Storage::missing($filename)) {
+            return $this->error('no file ' . $filename);
         }
         $contents = Storage::get($filename);
         $fId = Str::uuid();
         $tmpFile = storage_path("app/tmp/{$fId}.xlsx");
-        $ok = file_put_contents($tmpFile,$contents);
-        if($ok===false){
-            return $this->error('create tmp file fail '.$tmpFile,500,500);
+        $ok = file_put_contents($tmpFile, $contents);
+        if ($ok === false) {
+            return $this->error('create tmp file fail ' . $tmpFile, 500, 500);
         }
         $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
         $reader->setReadDataOnly(true);
@@ -166,28 +167,28 @@ class TermExportController extends Controller
             $tag = $activeWorksheet->getCell("F{$currLine}")->getValue();
             $language = $activeWorksheet->getCell("G{$currLine}")->getValue();
             $channel_id = $activeWorksheet->getCell("H{$currLine}")->getValue();
-            $query = ['word'=>$word,'tag'=>$tag];
+            $query = ['word' => $word, 'tag' => $tag];
             $channelId = null;
-            switch ($request->get('view')) {
+            switch ($request->input('view')) {
                 case 'channel':
                     # 向channel里面导入，忽略源数据的channel id 和 owner 都设置为这个channel 的
-                    $query['channal'] = $request->get('id');
-                    $channelId = $request->get('id');
+                    $query['channal'] = $request->input('id');
+                    $channelId = $request->input('id');
                     break;
                 case 'studio':
                     # 向 studio 里面导入，忽略源数据的owner 但是要检测 channel id 是否有权限
                     $query['owner'] = $owner_id;
-                    if(!empty($channel_id)){
+                    if (!empty($channel_id)) {
 
                         //有channel 数据，查看是否在studio中
                         $channel = ChannelApi::getById($channel_id);
-                        if($channel === false){
+                        if ($channel === false) {
                             $message .= "没有查到版本信息：{$channel_id} - {$word}\n";
                             $currLine++;
                             $countFail++;
                             continue 2;
                         }
-                        if($owner_id != $channel['studio_id']){
+                        if ($owner_id != $channel['studio_id']) {
                             $message .= "版本不在studio中：{$channel_id} - {$word}\n";
                             $currLine++;
                             $countFail++;
@@ -200,27 +201,27 @@ class TermExportController extends Controller
                     break;
             }
 
-            if(empty($id) && empty($word)){
+            if (empty($id) && empty($word)) {
                 break;
             }
 
             //查询此id是否有旧数据
-            if(!empty($id)){
+            if (!empty($id)) {
                 $oldRow = DhammaTerm::find($id);
                 //TODO 有 id 无 word 删除数据
-                if(empty($word)){
+                if (empty($word)) {
                     //查看权限
-                    if($oldRow->owner !== $user['user_uid']){
-                        if(!empty($oldRow->channal)){
+                    if ($oldRow->owner !== $user['user_uid']) {
+                        if (!empty($oldRow->channal)) {
                             //看是否为协作
-                            $power = ShareApi::getResPower($user['user_uid'],$oldRow->channal);
-                            if($power < 20){
+                            $power = ShareApi::getResPower($user['user_uid'], $oldRow->channal);
+                            if ($power < 20) {
                                 $message .= "无删除权限：{$id} - {$word}\n";
                                 $currLine++;
                                 $countFail++;
                                 continue;
                             }
-                        }else{
+                        } else {
                             $message .= "无删除权限：{$id} - {$word}\n";
                             $currLine++;
                             $countFail++;
@@ -232,27 +233,27 @@ class TermExportController extends Controller
                     $currLine++;
                     continue;
                 }
-            }else{
+            } else {
                 $oldRow = null;
             }
             //查询是否跟已有数据重复
             $row = DhammaTerm::where($query)->first();
-            if(!$row){
+            if (!$row) {
                 //不重复
-                if(isset($oldRow) && $oldRow){
+                if (isset($oldRow) && $oldRow) {
                     //找到旧的记录-修改旧数据
                     $row = $oldRow;
-                }else{
+                } else {
                     //没找到旧的记录-新建
                     $row = new DhammaTerm();
                     $row->id = app('snowflake')->id();
                     $row->guid = Str::uuid();
                     $row->word = $word;
-                    $row->create_time = time()*1000;
+                    $row->create_time = time() * 1000;
                 }
-            }else{
+            } else {
                 //重复-如果与旧的id不同,报错
-                if(isset($oldRow) && $oldRow && $row->guid !== $id){
+                if (isset($oldRow) && $oldRow && $row->guid !== $id) {
                     $message .= "重复的数据：{$id} - {$word}\n";
                     $currLine++;
                     $countFail++;
@@ -269,13 +270,13 @@ class TermExportController extends Controller
             $row->channal = $channelId;
             $row->editor_id = $user['user_id'];
             $row->owner = $owner_id;
-            $row->modify_time = time()*1000;
+            $row->modify_time = time() * 1000;
             $row->save();
 
             $currLine++;
         } while (true);
         unlink($tmpFile);
-        return $this->ok(["success"=>$currLine-2-$countFail,'fail'=>($countFail)],$message);
+        return $this->ok(["success" => $currLine - 2 - $countFail, 'fail' => ($countFail)], $message);
     }
 
 

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

@@ -22,55 +22,57 @@ class TransferController extends Controller
      */
     public function index(Request $request)
     {
-		switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'studio':
                 # 获取studio内所有channel
                 $user = AuthApi::current($request);
-                if(!$user){
+                if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
                 //判断当前用户是否有指定的studio的管理权限
-                $studioId = StudioApi::getIdByName($request->get('name'));
-                if($user['user_uid'] !== $studioId){
+                $studioId = StudioApi::getIdByName($request->input('name'));
+                if ($user['user_uid'] !== $studioId) {
                     return $this->error(__('auth.failed'));
                 }
-                switch ($request->get('view2')) {
+                switch ($request->input('view2')) {
                     case 'in':
-                        $table = Transfer::where('new_owner',$studioId);
+                        $table = Transfer::where('new_owner', $studioId);
                         break;
                     case 'out':
-                        $table = Transfer::where('origin_owner',$studioId);
+                        $table = Transfer::where('origin_owner', $studioId);
                         break;
                     default:
                         return $this->error('no view2');
-                    break;
+                        break;
                 }
-                $outNumber = Transfer::where('origin_owner',$studioId)
-                                    ->where('status','transferred')
-                                    ->count();
-                $inNumber = Transfer::where('new_owner',$studioId)
-                                    ->where('status','transferred')
-                                    ->count();
+                $outNumber = Transfer::where('origin_owner', $studioId)
+                    ->where('status', 'transferred')
+                    ->count();
+                $inNumber = Transfer::where('new_owner', $studioId)
+                    ->where('status', 'transferred')
+                    ->count();
                 break;
         }
-        if(!empty($search)){
-            $table->where('title', 'like', $search."%");
+        if (!empty($search)) {
+            $table->where('title', 'like', $search . "%");
         }
-        $table->orderBy($request->get('order','updated_at'),
-                        $request->get('dir','desc'));
+        $table->orderBy(
+            $request->input('order', 'updated_at'),
+            $request->input('dir', 'desc')
+        );
         $count = $table->count();
-        $table->skip($request->get("offset",0))
-              ->take($request->get('limit',100));
+        $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 100));
 
         $result = $table->get();
 
 
-		return $this->ok(["rows"=>TransferResource::collection($result),
-                              "count"=>$count,
-                              'out'=>$outNumber,
-                              'in'=>$inNumber,
-                            ]);
-
+        return $this->ok([
+            "rows" => TransferResource::collection($result),
+            "count" => $count,
+            'out' => $outNumber,
+            'in' => $inNumber,
+        ]);
     }
 
     /**
@@ -82,7 +84,7 @@ class TransferController extends Controller
     public function store(Request $request)
     {
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
         //
@@ -99,22 +101,22 @@ class TransferController extends Controller
 
         $validated = $request->validate($rules);
 
-        $resId = $request->get('res_id');
+        $resId = $request->input('res_id');
         foreach ($resId as $id) {
             $transfer = new Transfer;
             //查看权限
-            switch ($request->get('res_type')) {
+            switch ($request->input('res_type')) {
                 case 'channel':
                     $oldRes = Channel::find($id);
-                    if($oldRes->owner_uid !== $user['user_uid']){
-                        return $this->error(__('auth.failed'),[403],403);
+                    if ($oldRes->owner_uid !== $user['user_uid']) {
+                        return $this->error(__('auth.failed'), [403], 403);
                     }
                     $transfer->origin_owner = $oldRes->owner_uid;
                     break;
                 case 'article':
                     $oldRes = Article::find($id);
-                    if($oldRes->owner !== $user['user_uid']){
-                        return $this->error(__('auth.failed'),[403],403);
+                    if ($oldRes->owner !== $user['user_uid']) {
+                        return $this->error(__('auth.failed'), [403], 403);
                     }
                     $transfer->origin_owner = $oldRes->owner;
                     break;
@@ -123,17 +125,18 @@ class TransferController extends Controller
                     break;
             }
             //查重
-            if(Transfer::where('res_id',$id)
-                    ->where('res_type',$request->get('res_type'))
-                    ->where('status','transferred')
-                    ->exists()){
-                        return $this->error('该资源已经进入转让流程',[200],200);
-                    }
+            if (Transfer::where('res_id', $id)
+                ->where('res_type', $request->input('res_type'))
+                ->where('status', 'transferred')
+                ->exists()
+            ) {
+                return $this->error('该资源已经进入转让流程', [200], 200);
+            }
             $transfer->res_id = $id;
-            $transfer->res_type = $request->get('res_type');
+            $transfer->res_type = $request->input('res_type');
 
             $transfer->transferor_id = $user['user_uid'];
-            $transfer->new_owner = $request->get('new_owner');
+            $transfer->new_owner = $request->input('new_owner');
             $transfer->save();
         }
 
@@ -150,7 +153,6 @@ class TransferController extends Controller
     {
         //
         return $this->ok(new TransferResource($discussion));
-
     }
 
     /**
@@ -163,57 +165,57 @@ class TransferController extends Controller
     public function update(Request $request, Transfer $transfer)
     {
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error(__('auth.failed'),[403],403);
+        if (!$user) {
+            return $this->error(__('auth.failed'), [403], 403);
         }
         //权限
-        switch ($request->get('status')) {
+        switch ($request->input('status')) {
             case 'accept':
             case 'refuse':
-                if($transfer->new_owner!==$user['user_uid']){
-                    return $this->error(__('auth.failed'),[403],403);
+                if ($transfer->new_owner !== $user['user_uid']) {
+                    return $this->error(__('auth.failed'), [403], 403);
                 }
-                $transfer->status = $request->get('status');
+                $transfer->status = $request->input('status');
                 break;
             case 'cancel':
-                if($transfer->origin_owner!==$user['user_uid']){
-                    return $this->error(__('auth.failed'),[403],403);
+                if ($transfer->origin_owner !== $user['user_uid']) {
+                    return $this->error(__('auth.failed'), [403], 403);
                 }
                 $transfer->status = 'cancel';
                 break;
             default:
-                return $this->error(__('auth.failed'),[404],404);
+                return $this->error(__('auth.failed'), [404], 404);
                 break;
         }
 
-        try{
-            DB::transaction(function () use ($transfer,$request,$user) {
+        try {
+            DB::transaction(function () use ($transfer, $request, $user) {
                 $transfer->editor_id = $user['user_uid'];
                 $transfer->save();
 
-                if($request->get('status')==='accept'){
+                if ($request->input('status') === 'accept') {
                     $newOwner = UserApi::getByUuid($transfer->new_owner);
                     $isBasic = false;
-                    if(isset($newOwner['roles']) && is_array($newOwner['roles'])){
-                        $isBasic = in_array('basic',$newOwner['roles']);
+                    if (isset($newOwner['roles']) && is_array($newOwner['roles'])) {
+                        $isBasic = in_array('basic', $newOwner['roles']);
                     }
                     switch ($transfer->res_type) {
                         case 'channel':
-                            $newData = ['owner_uid'=>$transfer->new_owner];
-                            if($isBasic){
+                            $newData = ['owner_uid' => $transfer->new_owner];
+                            if ($isBasic) {
                                 $newData['status'] = 5;
                             }
-                            Channel::where('uid',$transfer->res_id)
-                                    ->update($newData);
+                            Channel::where('uid', $transfer->res_id)
+                                ->update($newData);
                             break;
                         case 'article':
                             $userId = UserApi::getIdByUuid($transfer->new_owner);
-                            $newData = ['owner'=>$transfer->new_owner,'owner_id'=>$userId] ;
-                            if($isBasic){
+                            $newData = ['owner' => $transfer->new_owner, 'owner_id' => $userId];
+                            if ($isBasic) {
                                 $newData['status'] = 10;
                             }
-                            Article::where('uid',$transfer->res_id)
-                                    ->update($newData);
+                            Article::where('uid', $transfer->res_id)
+                                ->update($newData);
                             break;
                         default:
                             # code...
@@ -221,13 +223,12 @@ class TransferController extends Controller
                     }
                 }
             });
-        }catch(\Exception $e){
-            Log::error('update.fail',['error'=>$e]);
-            return $this->error('update.fail',['message'=>$e],500);
+        } catch (\Exception $e) {
+            Log::error('update.fail', ['error' => $e]);
+            return $this->error('update.fail', ['message' => $e], 500);
         }
 
         return $this->ok(new TransferResource($transfer));
-
     }
 
     /**

api-v12/app/Http/Controllers/UploadController.php

@@ -32,23 +32,23 @@ class UploadController extends Controller
         ]);
         $file = $request->file('file');
 
-       //Move Uploaded File
-       if($request->get('is_tmp',false) == false){
-        $bucket = config('mint.attachments.bucket_name.permanent');
-       }else{
-        $bucket = config('mint.attachments.bucket_name.temporary');
-       }
+        //Move Uploaded File
+        if ($request->input('is_tmp', false) == false) {
+            $bucket = config('mint.attachments.bucket_name.permanent');
+        } else {
+            $bucket = config('mint.attachments.bucket_name.temporary');
+        }
 
-       $uploadFilename = Str::uuid().'.'.$file->extension();
-        $filename = $file->storeAs($bucket,$uploadFilename);
+        $uploadFilename = Str::uuid() . '.' . $file->extension();
+        $filename = $file->storeAs($bucket, $uploadFilename);
 
         $json = array(
-            'filename' => $bucket.'/'.$uploadFilename,
+            'filename' => $bucket . '/' . $uploadFilename,
             'size' => $file->getSize(),
             'type' => $file->getMimeType(),
-            'url' => storage_path('app/'.$filename),
+            'url' => storage_path('app/' . $filename),
             'uid' => Str::uuid(),
-            );
+        );
         return $this->ok($json);
     }
 

api-v12/app/Http/Controllers/UserController.php

@@ -16,31 +16,32 @@ class UserController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get("view")) {
+        switch ($request->input("view")) {
             case 'key':
-                $table = UserInfo::where('username','like','%'.$request->get("key").'%')
-                                ->orWhere('nickname','like','%'.$request->get("key").'%');
+                $table = UserInfo::where('username', 'like', '%' . $request->input("key") . '%')
+                    ->orWhere('nickname', 'like', '%' . $request->input("key") . '%');
 
                 break;
 
             case 'all':
-                $table = UserInfo::where('id','>',0);
+                $table = UserInfo::where('id', '>', 0);
                 break;
         }
-        if($request->has("search")){
-            $table = $table->where('nickname', 'like', "%".$request->get("search")."%");
+        if ($request->has("search")) {
+            $table = $table->where('nickname', 'like', "%" . $request->input("search") . "%");
         }
-        if($request->has("role")){
-            $table = $table->whereJsonContains('role',$request->get('role'));
+        if ($request->has("role")) {
+            $table = $table->whereJsonContains('role', $request->input('role'));
         }
         $count = $table->count();
-        $table = $table->orderBy($request->get('order','username'),
-                                 $request->get('dir','desc'));
-        $table = $table->skip($request->get("offset",0))
-                       ->take($request->get('limit',20));
+        $table = $table->orderBy(
+            $request->input('order', 'username'),
+            $request->input('dir', 'desc')
+        );
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 20));
         $result = $table->get();
-        return $this->ok(['rows'=>UserResource::collection($result),'count'=>$count]);
-
+        return $this->ok(['rows' => UserResource::collection($result), 'count' => $count]);
     }
 
     /**
@@ -63,7 +64,7 @@ class UserController extends Controller
     public function show($id)
     {
         //
-        $user = UserInfo::where('userid',$id)->first();
+        $user = UserInfo::where('userid', $id)->first();
         return $this->ok(new UserResource($user));
     }
 
@@ -77,13 +78,13 @@ class UserController extends Controller
     public function update(Request $request, $id)
     {
         //
-        $user = UserInfo::where('userid',$id)->first();
-        if($request->has('roles')){
-            $user->role = json_encode($request->get('roles'));
-        }else{
-            $user->nickname = $request->get('nickName');
-            $user->avatar = $request->get('avatar');
-            $user->email = $request->get('email');
+        $user = UserInfo::where('userid', $id)->first();
+        if ($request->has('roles')) {
+            $user->role = json_encode($request->input('roles'));
+        } else {
+            $user->nickname = $request->input('nickName');
+            $user->avatar = $request->input('avatar');
+            $user->email = $request->input('email');
         }
         $user->save();
         return $this->ok(new UserResource($user));

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

@@ -23,102 +23,116 @@ class UserDictController extends Controller
     public function index(Request $request)
     {
         //
-		$result=false;
-		$indexCol = ['id','word','type','grammar',
-                     'mean','parent','note','status',
-                     'factors','confidence','dict_id',
-                     'source','updated_at','creator_id'];
-		switch ($request->get('view')) {
+        $result = false;
+        $indexCol = [
+            'id',
+            'word',
+            'type',
+            'grammar',
+            'mean',
+            'parent',
+            'note',
+            'status',
+            'factors',
+            'confidence',
+            'dict_id',
+            'source',
+            'updated_at',
+            'creator_id'
+        ];
+        switch ($request->input('view')) {
             case 'all':
-            # 获取studio内所有channel
+                # 获取studio内所有channel
                 $user = AuthApi::current($request);
-                if(!$user){
+                if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
                 $table = UserDict::select($indexCol);
                 break;
             case 'studio':
-				# 获取studio内所有channel
+                # 获取studio内所有channel
                 $user = AuthApi::current($request);
-                if(!$user){
+                if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
                 //判断当前用户是否有指定的studio的权限
-                if($user['user_uid'] !== \App\Http\Api\StudioApi::getIdByName($request->get('name'))){
+                if ($user['user_uid'] !== \App\Http\Api\StudioApi::getIdByName($request->input('name'))) {
                     return $this->error(__('auth.failed'));
                 }
                 $table = UserDict::select($indexCol)
-                            ->where('creator_id', $user["user_id"])
-                            ->whereIn('source', ["_USER_WBW_","_USER_DICT_"]);
-				break;
-			case 'user':
-				# code...
-				$table = UserDict::select($indexCol)
-									->where('creator_id', $_COOKIE["user_id"])
-									->where('source', '<>', "_SYS_USER_WBW_");
-				break;
-			case 'word':
-				$table = UserDict::select($indexCol)
-								 ->where('word', $request->get("word"));
-				break;
+                    ->where('creator_id', $user["user_id"])
+                    ->whereIn('source', ["_USER_WBW_", "_USER_DICT_"]);
+                break;
+            case 'user':
+                # code...
+                $table = UserDict::select($indexCol)
+                    ->where('creator_id', $_COOKIE["user_id"])
+                    ->where('source', '<>', "_SYS_USER_WBW_");
+                break;
+            case 'word':
+                $table = UserDict::select($indexCol)
+                    ->where('word', $request->input("word"));
+                break;
             case 'community':
                 $table = UserDict::select($indexCol)
-                                ->where('word', $request->get("word"))
-                                ->where('status', '>',5)
-                                ->where(function($query) {
-                                    $query->where('source', "_USER_WBW_")
-                                            ->orWhere('source','_USER_DICT_');
-                                });
+                    ->where('word', $request->input("word"))
+                    ->where('status', '>', 5)
+                    ->where(function ($query) {
+                        $query->where('source', "_USER_WBW_")
+                            ->orWhere('source', '_USER_DICT_');
+                    });
                 break;
             case 'compound':
                 $dict_id = DictApi::getSysDict('robot_compound');
-                if($dict_id===false){
+                if ($dict_id === false) {
                     $this->error('no robot_compound');
                 }
-                $table = UserDict::where("dict_id",$dict_id)->where("word",$request->get('word'));
+                $table = UserDict::where("dict_id", $dict_id)->where("word", $request->input('word'));
                 break;
             case 'dict':
                 $dict_id = false;
-                if($request->has('name')){
-                   $dict_id = DictApi::getSysDict($request->get('name'));
-                }else if($request->has('id')){
-                    $dict_id = $request->get('id');
+                if ($request->has('name')) {
+                    $dict_id = DictApi::getSysDict($request->input('name'));
+                } else if ($request->has('id')) {
+                    $dict_id = $request->input('id');
                 }
 
-                if($dict_id===false){
-                    $this->error('no dict',[],404);
+                if ($dict_id === false) {
+                    $this->error('no dict', [], 404);
                 }
                 $table = UserDict::select($indexCol)
-                                 ->where("dict_id",$dict_id);
-			default:
-				# code...
-				break;
-		}
-        if($request->has("search")){
-            $table->where('word', 'like', $request->get("search")."%");
+                    ->where("dict_id", $dict_id);
+            default:
+                # code...
+                break;
+        }
+        if ($request->has("search")) {
+            $table->where('word', 'like', $request->input("search") . "%");
         }
-        if(($request->has('word'))){
-            $table = $table->where('word',$request->get('word'));
+        if (($request->has('word'))) {
+            $table = $table->where('word', $request->input('word'));
         }
-        if(($request->has('parent'))){
-            $table = $table->where('parent',$request->get('parent'));
+        if (($request->has('parent'))) {
+            $table = $table->where('parent', $request->input('parent'));
         }
-        if(($request->has('dict'))){
-            $dictId = DictInfo::where('shortname',$request->get('dict'))->value('id');
-            if(Str::isUuid($dictId)){
-                $table = $table->where('dict_id',$dictId);
+        if (($request->has('dict'))) {
+            $dictId = DictInfo::where('shortname', $request->input('dict'))->value('id');
+            if (Str::isUuid($dictId)) {
+                $table = $table->where('dict_id', $dictId);
             }
         }
         $count = $table->count();
 
-        $table->orderBy($request->get('order','updated_at'),
-                        $request->get('dir','desc'));
+        $table->orderBy(
+            $request->input('order', 'updated_at'),
+            $request->input('dir', 'desc')
+        );
 
-        $table->skip($request->get('offset',0))
-              ->take($request->get('limit',200));
+        $table->skip($request->input('offset', 0))
+            ->take($request->input('limit', 200));
 
         $result = $table->get();
-        return $this->ok(["rows"=>UserDictResource::collection($result),"count"=>$count]);
+        return $this->ok(["rows" => UserDictResource::collection($result), "count" => $count]);
     }
 
     /**
@@ -131,17 +145,17 @@ class UserDictController extends Controller
     {
         //
         $user  = AuthApi::current($request);
-		if(!$user){
-			$this->error("not login");
-		}
+        if (!$user) {
+            $this->error("not login");
+        }
 
-		$_data = json_decode($request->get("data"),true);
+        $_data = json_decode($request->input("data"), true);
 
-		switch($request->get('view')){
+        switch ($request->input('view')) {
             case "dict":
                 $src = "_USER_DICT_";
                 break;
-			case "wbw":
+            case "wbw":
                 $src = "_USER_WBW_";
                 break;
             default:
@@ -150,45 +164,55 @@ class UserDictController extends Controller
         }
         #查询用户重复的数据
         $iOk = 0;
-        $updateOk=0;
+        $updateOk = 0;
         foreach ($_data as $key => $word) {
             # code...
             $table = UserDict::where('creator_id', $user["user_id"])
-                                ->where('word',$word["word"]);
-            if(isset($word["type"])){$table = $table->where('type',$word["type"]);}
-            if(isset($word["grammar"])){$table = $table->where('grammar',$word["grammar"]);}
-            if(isset($word["parent"])){$table = $table->where('parent',$word["parent"]);}
-            if(isset($word["mean"])){$table = $table->where('mean',$word["mean"]);}
-            if(isset($word["factors"])){$table = $table->where('factors',$word["factors"]);}
+                ->where('word', $word["word"]);
+            if (isset($word["type"])) {
+                $table = $table->where('type', $word["type"]);
+            }
+            if (isset($word["grammar"])) {
+                $table = $table->where('grammar', $word["grammar"]);
+            }
+            if (isset($word["parent"])) {
+                $table = $table->where('parent', $word["parent"]);
+            }
+            if (isset($word["mean"])) {
+                $table = $table->where('mean', $word["mean"]);
+            }
+            if (isset($word["factors"])) {
+                $table = $table->where('factors', $word["factors"]);
+            }
             $isDoesntExist = $table->doesntExist();
-            if($isDoesntExist){
+            if ($isDoesntExist) {
                 #不存在插入数据
-                $word["id"]=app('snowflake')->id();
+                $word["id"] = app('snowflake')->id();
                 $word["source"] = $src;
-                $word["create_time"] = time()*1000;
-                $word["creator_id"]=$user["user_id"];
+                $word["create_time"] = time() * 1000;
+                $word["creator_id"] = $user["user_id"];
                 $id = UserDict::insert($word);
-                if(isset($word["status"]) && $word["status"] > 5){
+                if (isset($word["status"]) && $word["status"] > 5) {
                     $updateOk = $this->update_sys_wbw($word);
-                }else{
+                } else {
                     $updateOk = true;
                 }
                 $this->update_redis($word);
                 $iOk++;
-            }else{
+            } else {
                 //存在，修改数据
                 $origin = $table->first();
-                if(isset($word["note"])){
+                if (isset($word["note"])) {
                     $origin->note = $word["note"];
                 }
-                if(isset($word["confidence"])){
+                if (isset($word["confidence"])) {
                     $origin->confidence = $word["confidence"];
                 }
                 $origin->save();
             }
         }
 
-        return $this->ok([$iOk,$updateOk]);
+        return $this->ok([$iOk, $updateOk]);
     }
 
     /**
@@ -200,12 +224,12 @@ class UserDictController extends Controller
     public function show($id)
     {
         //
-		$result = UserDict::find($id);
-		if($result){
-			return $this->ok($result);
-		}else{
-			return $this->error("没有查询到数据");
-		}
+        $result = UserDict::find($id);
+        if ($result) {
+            return $this->ok($result);
+        } else {
+            return $this->error("没有查询到数据");
+        }
     }
 
     /**
@@ -218,16 +242,16 @@ class UserDictController extends Controller
     public function update(Request $request, $id)
     {
         //
-		$newData = $request->all();
-		$result = UserDict::where('id', $id)
-				->update($newData);
-		if($result){
-			$updateOk = $this->update_sys_wbw($newData);
-			$this->update_redis($newData);
-			return $this->ok([$result,$updateOk]);
-		}else{
-		    return $this->error("没有查询到数据");
-		}
+        $newData = $request->all();
+        $result = UserDict::where('id', $id)
+            ->update($newData);
+        if ($result) {
+            $updateOk = $this->update_sys_wbw($newData);
+            $this->update_redis($newData);
+            return $this->ok([$result, $updateOk]);
+        } else {
+            return $this->error("没有查询到数据");
+        }
     }
 
     /**
@@ -236,192 +260,206 @@ class UserDictController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Request $request,$id)
+    public function destroy(Request $request, $id)
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error(__('auth.failed'),[],403);
+        if (!$user) {
+            return $this->error(__('auth.failed'), [], 403);
         }
         $user_id = $user['user_id'];
 
-        if($request->has("id")){
-            $arrId = json_decode($request->get("id"),true) ;
+        if ($request->has("id")) {
+            $arrId = json_decode($request->input("id"), true);
             $count = 0;
             $updateOk = false;
             foreach ($arrId as $key => $id) {
                 # 找到对应数据
                 $data = UserDict::find($id);
                 //查看是否有权限删除
-                if($data->creator_id == $user_id){
+                if ($data->creator_id == $user_id) {
                     $result = UserDict::where('id', $id)
-                                    ->delete();
+                        ->delete();
                     $count += $result;
                     $updateOk = $this->update_sys_wbw($data);
                     $this->update_redis($data);
                 }
             }
-            return $this->ok([$count,$updateOk]);
-        }else{
+            return $this->ok([$count, $updateOk]);
+        } else {
             //删除单个单词
             $userDict = UserDict::find($id);
             //判断当前用户是否有指定的studio的权限
-            if((int)$user_id !== $userDict->creator_id){
+            if ((int)$user_id !== $userDict->creator_id) {
                 return $this->error(__('auth.failed'));
             }
             $delete = $userDict->delete();
             return $this->ok($delete);
         }
-
     }
-	public function delete(Request $request){
-		$arrId = json_decode($request->get("id"),true) ;
-		$count = 0;
-		$updateOk = false;
-		foreach ($arrId as $key => $id) {
-			$data = UserDict::where('id',$id)->first();
-			if($data){
-				# 找到对应数据
-				$param = [
-					"id"=>$id,
-					'creator_id'=>$_COOKIE["user_id"]
-				];
-				$del = UserDict::where($param)->delete();
-				$count += $del;
-				$updateOk = $this->update_sys_wbw($data);
-				$this->update_redis($data);
-			}
-		}
-		return $this->ok(['deleted'=>$count]);
-	}
+    public function delete(Request $request)
+    {
+        $arrId = json_decode($request->input("id"), true);
+        $count = 0;
+        $updateOk = false;
+        foreach ($arrId as $key => $id) {
+            $data = UserDict::where('id', $id)->first();
+            if ($data) {
+                # 找到对应数据
+                $param = [
+                    "id" => $id,
+                    'creator_id' => $_COOKIE["user_id"]
+                ];
+                $del = UserDict::where($param)->delete();
+                $count += $del;
+                $updateOk = $this->update_sys_wbw($data);
+                $this->update_redis($data);
+            }
+        }
+        return $this->ok(['deleted' => $count]);
+    }
 
-	/*
+    /*
 	更新系统wbw汇总表
 	*/
-	private function update_sys_wbw($data){
+    private function update_sys_wbw($data)
+    {
 
-		#查询用户重复的数据
-        if(!isset($data["type"])){$data["type"]=null;}
-        if(!isset($data["grammar"])){$data["grammar"]=null;}
-        if(!isset($data["parent"])){$data["parent"]=null;}
-        if(!isset($data["mean"])){$data["mean"]=null;}
-        if(!isset($data["factors"])){$data["factors"]=null;}
-        if(!isset($data["factormean"])){$data["factormean"]=null;}
+        #查询用户重复的数据
+        if (!isset($data["type"])) {
+            $data["type"] = null;
+        }
+        if (!isset($data["grammar"])) {
+            $data["grammar"] = null;
+        }
+        if (!isset($data["parent"])) {
+            $data["parent"] = null;
+        }
+        if (!isset($data["mean"])) {
+            $data["mean"] = null;
+        }
+        if (!isset($data["factors"])) {
+            $data["factors"] = null;
+        }
+        if (!isset($data["factormean"])) {
+            $data["factormean"] = null;
+        }
 
-		$count = UserDict::where('word',$data["word"])
-                        ->where('type',$data["type"])
-                        ->where('grammar',$data["grammar"])
-                        ->where('parent',$data["parent"])
-                        ->where('mean',$data["mean"])
-                        ->where('factors',$data["factors"])
-                        ->where('factormean',$data["factormean"])
-                        ->where('source',$data["source"])
-                        ->count();
+        $count = UserDict::where('word', $data["word"])
+            ->where('type', $data["type"])
+            ->where('grammar', $data["grammar"])
+            ->where('parent', $data["parent"])
+            ->where('mean', $data["mean"])
+            ->where('factors', $data["factors"])
+            ->where('factormean', $data["factormean"])
+            ->where('source', $data["source"])
+            ->count();
 
-		if($count === 0){
+        if ($count === 0) {
             # 没有任何用户有这个数据
-			#删除数据
-			$result = UserDict::where('word',$data["word"])
-			->where('type',$data["type"])
-			->where('grammar',$data["grammar"])
-			->where('parent',$data["parent"])
-			->where('mean',$data["mean"])
-			->where('factors',$data["factors"])
-			->where('factormean',$data["factormean"])
-			->where('source','_SYS_USER_WBW_')
-			->delete();
-			return($result);
-
-		}else{
+            #删除数据
+            $result = UserDict::where('word', $data["word"])
+                ->where('type', $data["type"])
+                ->where('grammar', $data["grammar"])
+                ->where('parent', $data["parent"])
+                ->where('mean', $data["mean"])
+                ->where('factors', $data["factors"])
+                ->where('factormean', $data["factormean"])
+                ->where('source', '_SYS_USER_WBW_')
+                ->delete();
+            return ($result);
+        } else {
             #更新或新增
-			#查询最早上传这个数据的用户
-			$creator_id = UserDict::where('word',$data["word"])
-							->where('type',$data["type"])
-							->where('grammar',$data["grammar"])
-							->where('parent',$data["parent"])
-							->where('mean',$data["mean"])
-							->where('factors',$data["factors"])
-							->where('factormean',$data["factormean"])
-							->whereIn('source',['_USER_WBW_','_USER_DICT_'])
-							->orderby("created_at",'asc')
-							->value("creator_id");
+            #查询最早上传这个数据的用户
+            $creator_id = UserDict::where('word', $data["word"])
+                ->where('type', $data["type"])
+                ->where('grammar', $data["grammar"])
+                ->where('parent', $data["parent"])
+                ->where('mean', $data["mean"])
+                ->where('factors', $data["factors"])
+                ->where('factormean', $data["factormean"])
+                ->whereIn('source', ['_USER_WBW_', '_USER_DICT_'])
+                ->orderby("created_at", 'asc')
+                ->value("creator_id");
 
-            $count = UserDict::where('word',$data["word"])
-                        ->where('type',$data["type"])
-                        ->where('grammar',$data["grammar"])
-                        ->where('parent',$data["parent"])
-                        ->where('mean',$data["mean"])
-                        ->where('factors',$data["factors"])
-                        ->where('factormean',$data["factormean"])
-                        ->where('source','_SYS_USER_WBW_')
-                        ->count();
-            if($count === 0){
+            $count = UserDict::where('word', $data["word"])
+                ->where('type', $data["type"])
+                ->where('grammar', $data["grammar"])
+                ->where('parent', $data["parent"])
+                ->where('mean', $data["mean"])
+                ->where('factors', $data["factors"])
+                ->where('factormean', $data["factormean"])
+                ->where('source', '_SYS_USER_WBW_')
+                ->count();
+            if ($count === 0) {
                 #社区字典没有 新增
                 $result = UserDict::insert(
-				[
-                    'id' =>app('snowflake')->id(),
-					'word'=>$data["word"],
-					'type'=>$data["type"],
-					'grammar'=>$data["grammar"],
-					'parent'=>$data["parent"],
-					'mean'=>$data["mean"],
-					'factors'=>$data["factors"],
-					'factormean'=>$data["factormean"],
-					'language'=>$data["language"],
-					'source'=>"_SYS_USER_WBW_",
-                    'creator_id' => $data["creator_id"],
-					'ref_counter' => 1,
-                    'dict_id' => DictApi::getSysDict('community_extract'),
-                    "create_time"=>time()*1000
-                    ]);
-            }else{
-                #有，更新
-                $result = UserDict::where('word',$data["word"])
-                        ->where('type',$data["type"])
-                        ->where('grammar',$data["grammar"])
-                        ->where('parent',$data["parent"])
-                        ->where('mean',$data["mean"])
-                        ->where('factors',$data["factors"])
-                        ->where('factormean',$data["factormean"])
-                        ->where('source','_SYS_USER_WBW_')
-                        ->update(
                     [
-                        'creator_id'=>$creator_id,
-                        'ref_counter'=>$count
-                    ]);
+                        'id' => app('snowflake')->id(),
+                        'word' => $data["word"],
+                        'type' => $data["type"],
+                        'grammar' => $data["grammar"],
+                        'parent' => $data["parent"],
+                        'mean' => $data["mean"],
+                        'factors' => $data["factors"],
+                        'factormean' => $data["factormean"],
+                        'language' => $data["language"],
+                        'source' => "_SYS_USER_WBW_",
+                        'creator_id' => $data["creator_id"],
+                        'ref_counter' => 1,
+                        'dict_id' => DictApi::getSysDict('community_extract'),
+                        "create_time" => time() * 1000
+                    ]
+                );
+            } else {
+                #有，更新
+                $result = UserDict::where('word', $data["word"])
+                    ->where('type', $data["type"])
+                    ->where('grammar', $data["grammar"])
+                    ->where('parent', $data["parent"])
+                    ->where('mean', $data["mean"])
+                    ->where('factors', $data["factors"])
+                    ->where('factormean', $data["factormean"])
+                    ->where('source', '_SYS_USER_WBW_')
+                    ->update(
+                        [
+                            'creator_id' => $creator_id,
+                            'ref_counter' => $count
+                        ]
+                    );
             }
-			return($result);
-		}
-	}
-
-	private function update_redis($word){
-		#更新 redis
-		$Fetch = UserDict::where(['word'=>$word['word'],"source"=>"_USER_WBW_"])->get();
-		$redisWord=array();
-		foreach ($Fetch as  $one) {
-			# code...
-			$redisWord[] = array(
-							$one["id"],
-							$one["word"],
-							$one["type"],
-							$one["grammar"],
-							$one["parent"],
-							$one["mean"],
-							$one["note"],
-							$one["factors"],
-							$one["factormean"],
-							$one["status"],
-							$one["confidence"],
-							$one["creator_id"],
-							$one["source"],
-							$one["language"]
-							);
-		}
-		$redisData = json_encode($redisWord,JSON_UNESCAPED_UNICODE);
-		Redis::hSet("dict/user",$word['word'],$redisData);
-		$redisData1 = Redis::hGet("dict/user",$word['word']);
+            return ($result);
+        }
+    }
 
-		#更新redis结束
-	}
+    private function update_redis($word)
+    {
+        #更新 redis
+        $Fetch = UserDict::where(['word' => $word['word'], "source" => "_USER_WBW_"])->get();
+        $redisWord = array();
+        foreach ($Fetch as  $one) {
+            # code...
+            $redisWord[] = array(
+                $one["id"],
+                $one["word"],
+                $one["type"],
+                $one["grammar"],
+                $one["parent"],
+                $one["mean"],
+                $one["note"],
+                $one["factors"],
+                $one["factormean"],
+                $one["status"],
+                $one["confidence"],
+                $one["creator_id"],
+                $one["source"],
+                $one["language"]
+            );
+        }
+        $redisData = json_encode($redisWord, JSON_UNESCAPED_UNICODE);
+        Redis::hSet("dict/user", $word['word'], $redisData);
+        $redisData1 = Redis::hGet("dict/user", $word['word']);
 
+        #更新redis结束
+    }
 }

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

@@ -17,32 +17,32 @@ class UserOperationDailyController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case "user-all":
-                $queryUserUuid = UserApi::getIdByName($request->get('studio_name'));
+                $queryUserUuid = UserApi::getIdByName($request->input('studio_name'));
                 $user = AuthApi::current($request);
-                if(!$user){
+                if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
                 //TODO 判断是否有查看权限
-                if($queryUserUuid !== $user["user_uid"]){
+                if ($queryUserUuid !== $user["user_uid"]) {
                     return $this->error(__('auth.failed'));
                 }
-                $result = UserOperationDaily::where('user_id',$user["user_id"])
-                                  ->select(['date_int','duration','hit'])
-                                  ->orderBy("date_int")
-                                  ->get();
+                $result = UserOperationDaily::where('user_id', $user["user_id"])
+                    ->select(['date_int', 'duration', 'hit'])
+                    ->orderBy("date_int")
+                    ->get();
                 break;
             case "user-year":
-                $queryUserId = UserApi::getIntIdByName($request->get('studio_name'));
+                $queryUserId = UserApi::getIntIdByName($request->input('studio_name'));
                 //TODO 判断是否有查看权限
-                $result = UserOperationDaily::where('user_id',$queryUserId)
-                                  ->select(['date_int','duration'])
-                                  ->orderBy("date_int")
-                                  ->get();
+                $result = UserOperationDaily::where('user_id', $queryUserId)
+                    ->select(['date_int', 'duration'])
+                    ->orderBy("date_int")
+                    ->get();
                 break;
         }
-        return $this->ok(["rows"=>$result,"count"=>count($result)]);
+        return $this->ok(["rows" => $result, "count" => count($result)]);
     }
 
     /**

api-v12/app/Http/Controllers/UserStatisticController.php

@@ -67,7 +67,7 @@ class UserStatisticController extends Controller
         $termCountWithNote = 0;
         $myDictCount = 0;
         //总经验值
-        if (!$request->has('view') || $request->get('view') === 'exp-sum') {
+        if (!$request->has('view') || $request->input('view') === 'exp-sum') {
             $expSum = Cache::remember(
                 "user/{$userName}/exp/sum",
                 $cacheExpiry,
@@ -79,7 +79,7 @@ class UserStatisticController extends Controller
         }
 
         //逐词解析
-        if (!$request->has('view') || $request->get('view') === 'wbw-count') {
+        if (!$request->has('view') || $request->input('view') === 'wbw-count') {
             $wbwCount = Cache::remember(
                 "user/{$userName}/wbw/count",
                 $cacheExpiry,
@@ -91,7 +91,7 @@ class UserStatisticController extends Controller
         }
 
         //查字典次数
-        if (!$request->has('view') || $request->get('view') === 'lookup-count') {
+        if (!$request->has('view') || $request->input('view') === 'lookup-count') {
             $lookupCount = Cache::remember(
                 "user/{$userName}/lookup/count",
                 $cacheExpiry,
@@ -104,7 +104,7 @@ class UserStatisticController extends Controller
         }
         //译文
         //TODO 判断是否是译文channel
-        if (!$request->has('view') || $request->get('view') === 'translation-count') {
+        if (!$request->has('view') || $request->input('view') === 'translation-count') {
             $translationCount = Cache::remember(
                 "user/{$userName}/translation/count",
                 $cacheExpiry,
@@ -124,7 +124,7 @@ class UserStatisticController extends Controller
             );
         }
         //术语
-        if (!$request->has('view') || $request->get('view') === 'term-count') {
+        if (!$request->has('view') || $request->input('view') === 'term-count') {
             $termCount = Cache::remember(
                 "user/{$userName}/term/count",
                 $cacheExpiry,
@@ -144,7 +144,7 @@ class UserStatisticController extends Controller
             );
         }
         //单词本
-        if (!$request->has('view') || $request->get('view') === 'my-dict-count') {
+        if (!$request->has('view') || $request->input('view') === 'my-dict-count') {
             $myDictCount = Cache::remember(
                 "user/{$userName}/dict/count",
                 $cacheExpiry,

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

@@ -14,25 +14,26 @@ use App\Http\Api\StudioApi;
 
 class ViewController extends Controller
 {
-    private function getTargetId($request){
+    private function getTargetId($request)
+    {
         /*
         *根据target type 和不同类型的不同参数
         */
         $target_id = FALSE;
-        switch ($request->get("target_type")) {
+        switch ($request->input("target_type")) {
             case 'chapter-instance':
                 # code...
-                $target_id = $request->get("target_id");
+                $target_id = $request->input("target_id");
                 break;
             case 'chapter':
                 # code...
-                $channelId = $request->get("channel");
-                if(Str::isUuid($channelId)){
-                    $target_id = ProgressChapter::where("channel_id",$request->get("channel"))
-                                            ->where("book",$request->get("book",0))
-                                            ->where("para",$request->get("para",0))
-                                            ->value("uid");
-                }else{
+                $channelId = $request->input("channel");
+                if (Str::isUuid($channelId)) {
+                    $target_id = ProgressChapter::where("channel_id", $request->input("channel"))
+                        ->where("book", $request->input("book", 0))
+                        ->where("para", $request->input("para", 0))
+                        ->value("uid");
+                } else {
                     $target_id = false;
                 }
                 break;
@@ -43,16 +44,15 @@ class ViewController extends Controller
                 # code...
                 break;
             default:
-                $target_id = $request->get("target_id");
+                $target_id = $request->input("target_id");
                 # code...
                 break;
         }
-        if(Str::isUuid($target_id)){
+        if (Str::isUuid($target_id)) {
             return $target_id;
-        }else{
+        } else {
             return false;
         }
-
     }
     /**
      * Display a listing of the resource.
@@ -62,67 +62,67 @@ class ViewController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get("view")) {
+        switch ($request->input("view")) {
             case 'count':
                 #获取 target id
                 $target_id = $this->getTargetId($request);
-                if($target_id){
-                    $count = View::where("target_id",$target_id)->count();
-                }else{
+                if ($target_id) {
+                    $count = View::where("target_id", $target_id)->count();
+                } else {
                     $count = 0;
                 }
                 return $this->ok($count);
                 break;
             case 'user-recent':
                 $user = AuthApi::current($request);
-                if(!$user){
+                if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
                 $user_id = $user["user_uid"];
-				$views =  View::where("user_id",$user_id)->orderBy('created_at','desc');
-				$views = $views->take($request->get("take",10));
+                $views =  View::where("user_id", $user_id)->orderBy('created_at', 'desc');
+                $views = $views->take($request->input("take", 10));
                 $items = $views->get();
                 return $this->ok($items);
                 break;
             case 'user':
                 $user = AuthApi::current($request);
-                if(!$user){
+                if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
                 $user_id = $user["user_uid"];
-                $table =  View::where("user_id",$user_id);
+                $table =  View::where("user_id", $user_id);
                 break;
             case 'studio':
                 # 获取studio内所有 数据
                 $user = AuthApi::current($request);
-                if(!$user){
+                if (!$user) {
                     return $this->error(__('auth.failed'));
                 }
                 //判断当前用户是否有指定的studio的权限
-                $studioId = StudioApi::getIdByName($request->get('name'));
-                if($user['user_uid'] !== $studioId){
+                $studioId = StudioApi::getIdByName($request->input('name'));
+                if ($user['user_uid'] !== $studioId) {
                     return $this->error(__('auth.failed'));
                 }
-                $table = View::where('user_id',$studioId);
+                $table = View::where('user_id', $studioId);
                 break;
             default:
                 # code...
                 break;
         }
         //处理搜索
-        if($request->has("search")){
-            $table = $table->where('name', 'like', "%".$request->get("search")."%");
+        if ($request->has("search")) {
+            $table = $table->where('name', 'like', "%" . $request->input("search") . "%");
         }
         //获取记录总条数
         $count = $table->count();
         //处理排序
-        $table = $table->orderBy($request->get("order",'updated_at'),$request->get("dir",'desc'));
+        $table = $table->orderBy($request->input("order", 'updated_at'), $request->input("dir", 'desc'));
         //处理分页
-        $table = $table->skip($request->get("offset",0))
-                       ->take($request->get("limit",20));
+        $table = $table->skip($request->input("offset", 0))
+            ->take($request->input("limit", 20));
         //获取数据
         $result = $table->get();
-        return $this->ok(["rows"=>ViewResource::collection($result),"count"=>$count]);
+        return $this->ok(["rows" => ViewResource::collection($result), "count" => $count]);
     }
 
     /**
@@ -146,16 +146,16 @@ class ViewController extends Controller
 */
         //根据target type 获取 target id
         $target_id = $this->getTargetId($request);
-        if(!$target_id){
+        if (!$target_id) {
             return $this->error('no id');
         }
         $clientIp = request()->ip();
         $param = [
             'target_id' => $target_id,
-            'target_type' => $request->get("target_type"),
+            'target_type' => $request->input("target_type"),
         ];
         $user = AuthApi::current($request);
-        if($user){
+        if ($user) {
             //已经登陆
             $user_id = $user['user_uid'];
             $param['user_id'] = $user_id;
@@ -164,32 +164,32 @@ class ViewController extends Controller
         $new = View::firstOrNew($param);
         $new->user_ip = $clientIp;
 
-		switch($request->get("target_type")){
-			case "chapter":
-				$new->title = ProgressChapter::where("channel_id",$request->get("channel"))
-                                            ->where("book",$request->get("book"))
-                                            ->where("para",$request->get("para"))
-                                            ->value("title");
-				$new->org_title = PaliText::where("book",$request->get("book"))
-										->where("paragraph",$request->get("para"))
-										->value("toc");
-				//获取标题 成功
-				$new->meta = \json_encode([
-					"book"=>$request->get("book"),
-					"para"=>$request->get("para"),
-					"channel"=>$request->get("channel"),
-                    "mode"=>$request->get("mode","read"),
-				]);
-				break;
+        switch ($request->input("target_type")) {
+            case "chapter":
+                $new->title = ProgressChapter::where("channel_id", $request->input("channel"))
+                    ->where("book", $request->input("book"))
+                    ->where("para", $request->input("para"))
+                    ->value("title");
+                $new->org_title = PaliText::where("book", $request->input("book"))
+                    ->where("paragraph", $request->input("para"))
+                    ->value("toc");
+                //获取标题 成功
+                $new->meta = \json_encode([
+                    "book" => $request->input("book"),
+                    "para" => $request->input("para"),
+                    "channel" => $request->input("channel"),
+                    "mode" => $request->input("mode", "read"),
+                ]);
+                break;
             default:
                 return $this->error('未知的数据类型');
                 break;
-		}
-		$new->count = $new->count+1;
+        }
+        $new->count = $new->count + 1;
         $new->save();
-		//保存成功
+        //保存成功
 
-        $count = View::where("target_id",$new->target_id)->count();
+        $count = View::where("target_id", $new->target_id)->count();
         return $this->ok($count);
     }
 

api-v12/app/Http/Controllers/VocabularyController.php

@@ -17,9 +17,9 @@ class VocabularyController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get("view")) {
+        switch ($request->input("view")) {
             case 'key':
-                $key = $request->get("key");
+                $key = $request->input("key");
                 $result = Cache::remember(
                     "/dict_vocabulary/{$key}",
                     config('mint.cache.expire'),

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

@@ -44,7 +44,7 @@ class WbwController extends Controller
             //未登录用户
             return $this->error(__('auth.failed'), [], 401);
         }
-        $channel = Channel::where('uid', $request->get('channel_id'))->first();
+        $channel = Channel::where('uid', $request->input('channel_id'))->first();
         if (!$channel) {
             return $this->error(__('auth.failed'));
         }
@@ -56,9 +56,9 @@ class WbwController extends Controller
             }
         }
         //查看WbwBlock是否已经建立
-        $wbwBlockId = WbwBlock::where('book_id', $request->get('book'))
-            ->where('paragraph', $request->get('para'))
-            ->where('channel_uid', $request->get('channel_id'))
+        $wbwBlockId = WbwBlock::where('book_id', $request->input('book'))
+            ->where('paragraph', $request->input('para'))
+            ->where('channel_uid', $request->input('channel_id'))
             ->value('uid');
         if (!Str::isUuid($wbwBlockId)) {
             $wbwBlock = new WbwBlock();
@@ -67,9 +67,9 @@ class WbwController extends Controller
             $wbwBlock->uid = $wbwBlockId;
             $wbwBlock->creator_uid = $user["user_uid"];
             $wbwBlock->editor_id = $user["user_id"];
-            $wbwBlock->book_id = $request->get('book');
-            $wbwBlock->paragraph = $request->get('para');
-            $wbwBlock->channel_uid = $request->get('channel_id');
+            $wbwBlock->book_id = $request->input('book');
+            $wbwBlock->paragraph = $request->input('para');
+            $wbwBlock->channel_uid = $request->input('channel_id');
             $wbwBlock->lang = $channel->lang;
             $wbwBlock->status = $channel->status;
             $wbwBlock->create_time = time() * 1000;
@@ -77,12 +77,12 @@ class WbwController extends Controller
             $wbwBlock->save();
         }
         $wbw = Wbw::where('block_uid', $wbwBlockId)
-            ->where('wid', $request->get('sn'))
+            ->where('wid', $request->input('sn'))
             ->first();
-        $sent = PaliSentence::where('book', $request->get('book'))
-            ->where('paragraph', $request->get('para'))
-            ->where('word_begin', "<=", $request->get('sn'))
-            ->where('word_end', ">=", $request->get('sn'))
+        $sent = PaliSentence::where('book', $request->input('book'))
+            ->where('paragraph', $request->input('para'))
+            ->where('word_begin', "<=", $request->input('sn'))
+            ->where('word_end', ">=", $request->input('sn'))
             ->first();
         if (!$wbw) {
             //建立一个句子的逐词解析数据
@@ -117,8 +117,8 @@ class WbwController extends Controller
                 $newWbw->uid = Str::uuid();
                 $newWbw->creator_uid = $channel->owner_uid;
                 $newWbw->editor_id = $user["user_id"];
-                $newWbw->book_id = $request->get('book');
-                $newWbw->paragraph = $request->get('para');
+                $newWbw->book_id = $request->input('book');
+                $newWbw->paragraph = $request->input('para');
                 $newWbw->wid = $word->sn[0];
                 $newWbw->block_uid = $wbwBlockId;
                 $newWbw->data = $xml;
@@ -127,7 +127,7 @@ class WbwController extends Controller
                 $newWbw->create_time = time() * 1000;
                 $newWbw->modify_time = time() * 1000;
                 $newWbw->save();
-                if ($word->sn[0] === $request->get('sn')) {
+                if ($word->sn[0] === $request->input('sn')) {
                     $wbw = $newWbw;
                 }
             }
@@ -135,7 +135,7 @@ class WbwController extends Controller
 
         $count = 0;
         $wbwId = array();
-        foreach ($request->get('data') as $row) {
+        foreach ($request->input('data') as $row) {
             $wbw = Wbw::where('block_uid', $wbwBlockId)
                 ->where('wid', $row['sn'])
                 ->first();
@@ -156,11 +156,11 @@ class WbwController extends Controller
         //获取整个句子数据
         $corpus = new CorpusController;
         $wbwString = $corpus->getWbw(
-            $request->get('book'),
-            $request->get('para'),
+            $request->input('book'),
+            $request->input('para'),
             $sent->word_begin,
             $sent->word_end,
-            $request->get('channel_id')
+            $request->input('channel_id')
         );
         if ($wbwString) {
             $wbwSentence = json_decode($wbwString);

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

@@ -57,10 +57,10 @@ class WbwLookupController extends Controller
 
         $this->initSysDict();
 
-        $words = \explode(',', $request->get("word"));
-        $bases = \explode(',', $request->get("base"));
+        $words = \explode(',', $request->input("word"));
+        $bases = \explode(',', $request->input("base"));
         # 查询深度
-        $deep = $request->get("deep", 2);
+        $deep = $request->input("deep", 2);
         $result = $this->lookup($words, $bases, $deep);
         $endAt = microtime(true) * 1000;
 
@@ -204,10 +204,10 @@ class WbwLookupController extends Controller
         // system regular
         $this->initSysDict();
 
-        $channel = Channel::find($request->get('channel_id'));
-        $orgData = $request->get('data');
+        $channel = Channel::find($request->input('channel_id'));
+        $orgData = $request->input('data');
         $lang = [];
-        foreach ($request->get('lang', []) as $value) {
+        foreach ($request->input('lang', []) as $value) {
             $lang[] = strtolower($value);
         }
         //句子中的单词
@@ -420,7 +420,7 @@ class WbwLookupController extends Controller
     {
         $startAt = microtime(true) * 1000;
 
-        $channel = Channel::find($request->get('channel_id'));
+        $channel = Channel::find($request->input('channel_id'));
 
         //查询句子中的单词
         $sent = \explode('-', $sentId);

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

@@ -29,85 +29,88 @@ class WbwSentenceController extends Controller
         $result = [];
         $user = AuthApi::current($request);
         $user_uid = null;
-        if($user){
+        if ($user) {
             $user_uid = $user['user_uid'];
         }
-        $sentId = $request->get('book').'-'.
-                    $request->get('para').'-'.
-                    $request->get('wordStart').'-'.
-                    $request->get('wordEnd');
-        switch ($request->get('view')) {
+        $sentId = $request->input('book') . '-' .
+            $request->input('para') . '-' .
+            $request->input('wordStart') . '-' .
+            $request->input('wordEnd');
+        switch ($request->input('view')) {
             case 'course-answer':
-                if($request->has('course')){
-                    $channelsId[] = Course::where('id',$request->get('course'))
-                                    ->value('channel_id');
+                if ($request->has('course')) {
+                    $channelsId[] = Course::where('id', $request->input('course'))
+                        ->value('channel_id');
                 }
                 break;
             case 'sent-can-read':
                 $channels = [];
-                if($request->has('course')){
-                    $channels = CourseApi::getStudentChannels($request->get('course'));
-                    $channels[] = Course::where('id',$request->get('course'))
-                                    ->value('channel_id');
-                }else{
+                if ($request->has('course')) {
+                    $channels = CourseApi::getStudentChannels($request->input('course'));
+                    $channels[] = Course::where('id', $request->input('course'))
+                        ->value('channel_id');
+                } else {
                     $channels = ChannelApi::getCanReadByUser($user_uid);
                 }
 
 
-                if($request->has('exclude')){
+                if ($request->has('exclude')) {
                     //移除无需查询的channel
                     foreach ($channels as $key => $id) {
-                        if($id !== $request->get('exclude')){
+                        if ($id !== $request->input('exclude')) {
                             $channelsId[] = $id;
                         }
                     }
-                }else if($request->has('channels')){
+                } else if ($request->has('channels')) {
                     //仅列出指定的channel
-                    $include = explode(',', $request->get('channels'));
+                    $include = explode(',', $request->input('channels'));
                     foreach ($channels as $key => $id) {
-                        if(in_array($id, $include)){
+                        if (in_array($id, $include)) {
                             $channelsId[] = $id;
                         }
                     }
-                }else{
+                } else {
                     $channelsId = $channels;
                 }
                 break;
         }
 
         $validBlocks = WbwSentenceController::getBlocksByChannels(
-                $channelsId,
-                $request->get('book'),
-                $request->get('para'),
-                $request->get('wordStart')
-            );
+            $channelsId,
+            $request->input('book'),
+            $request->input('para'),
+            $request->input('wordStart')
+        );
 
         foreach ($validBlocks as $key => $blockId) {
-        $channel = WbwBlock::where('uid',$blockId)->first();
-        $corpus = new CorpusController;
-        $props = $corpus->getSentTpl($sentId,[$channel->channel_uid],
-                        'edit',true,
-                        'react');
-        $result[] = $props;
+            $channel = WbwBlock::where('uid', $blockId)->first();
+            $corpus = new CorpusController;
+            $props = $corpus->getSentTpl(
+                $sentId,
+                [$channel->channel_uid],
+                'edit',
+                true,
+                'react'
+            );
+            $result[] = $props;
         }
-        return $this->ok(['rows'=>$result,'count'=>count($result)]);
-
-
+        return $this->ok(['rows' => $result, 'count' => count($result)]);
     }
 
-    public static function getBlocksByChannels($channelsId,$book,$para,$wordId){
-        $wbwBlocksId = WbwBlock::where('book_id',$book)
-                            ->where('paragraph',$para)
-                            ->whereIn('channel_uid',$channelsId)
-                            ->select('uid')
-                            ->get();
-        $validBlocks = Wbw::whereIn('block_uid',$wbwBlocksId)
-                        ->where('book_id',$book)
-                        ->where('paragraph',$para)
-                        ->where('wid',$wordId)
-                        ->select('block_uid')
-                        ->groupBy('block_uid')
-                        ->get();
+    public static function getBlocksByChannels($channelsId, $book, $para, $wordId)
+    {
+        $wbwBlocksId = WbwBlock::where('book_id', $book)
+            ->where('paragraph', $para)
+            ->whereIn('channel_uid', $channelsId)
+            ->select('uid')
+            ->get();
+        $validBlocks = Wbw::whereIn('block_uid', $wbwBlocksId)
+            ->where('book_id', $book)
+            ->where('paragraph', $para)
+            ->where('wid', $wordId)
+            ->select('block_uid')
+            ->groupBy('block_uid')
+            ->get();
         $blocksId = [];
         foreach ($validBlocks as $key => $block) {
             $blocksId[] = $block->block_uid;
@@ -115,14 +118,15 @@ class WbwSentenceController extends Controller
         return $blocksId;
     }
 
-    public static function getWbwIdByChannels($channelsId,$book,$para,$wordId){
-        $validBlocks = WbwSentenceController::getBlocksByChannels($channelsId,$book,$para,$wordId);
-        $wbwId = Wbw::whereIn('block_uid',$validBlocks)
-                        ->where('book_id',$book)
-                        ->where('paragraph',$para)
-                        ->where('wid',$wordId)
-                        ->select('uid')
-                        ->get();
+    public static function getWbwIdByChannels($channelsId, $book, $para, $wordId)
+    {
+        $validBlocks = WbwSentenceController::getBlocksByChannels($channelsId, $book, $para, $wordId);
+        $wbwId = Wbw::whereIn('block_uid', $validBlocks)
+            ->where('book_id', $book)
+            ->where('paragraph', $para)
+            ->where('wid', $wordId)
+            ->select('uid')
+            ->get();
         $id = [];
         foreach ($wbwId as $key => $value) {
             $id[] = $value->uid;
@@ -169,27 +173,27 @@ class WbwSentenceController extends Controller
      * @param  \App\Models\Wbw  $wbw
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Request $request,string $sentId)
+    public function destroy(Request $request, string $sentId)
     {
         //
         //鉴权
         $user = AuthApi::current($request);
-        if(!$user ){
+        if (!$user) {
             //未登录用户
-            return $this->error(__('auth.failed'),401,401);
+            return $this->error(__('auth.failed'), 401, 401);
         }
-        $channelId = $request->get('channel');
-        if(!ChannelApi::canManageByUser($channelId,$user['user_uid'])){
-            return $this->error(__('auth.failed'),403,403);
+        $channelId = $request->input('channel');
+        if (!ChannelApi::canManageByUser($channelId, $user['user_uid'])) {
+            return $this->error(__('auth.failed'), 403, 403);
         }
-        $sent = explode('-',$sentId);
-        $wbwBlockId = WbwBlock::where('book_id',$sent[0])
-                        ->where('paragraph',$sent[1])
-                        ->where('channel_uid',$channelId)
-                        ->value('uid');
-        $delete = Wbw::where('block_uid',$wbwBlockId)
-                    ->whereBetween('wid',[$sent[2],$sent[3]])
-                    ->delete();
+        $sent = explode('-', $sentId);
+        $wbwBlockId = WbwBlock::where('book_id', $sent[0])
+            ->where('paragraph', $sent[1])
+            ->where('channel_uid', $channelId)
+            ->value('uid');
+        $delete = Wbw::where('block_uid', $wbwBlockId)
+            ->whereBetween('wid', [$sent[2], $sent[3]])
+            ->delete();
         return $this->ok($delete);
     }
 }

api-v12/app/Http/Controllers/WbwTemplateController.php

@@ -17,22 +17,22 @@ class WbwTemplateController extends Controller
     public function index(Request $request)
     {
         //
-		switch($request->get('view')){
-			case "para":
-				$wbw = WbwTemplate::where("book",$request->get('book'))
-									->where("paragraph",$request->get('paragraph'))
-									->get(['wid','word','real']);
-				return $this->sendResponse(WbwTemplateResource::collection($wbw),"ok");
-				break;
-			case "word":
-				$wbw = WbwTemplate::where("word",$request->get('word'))->get(['book','paragraph']);
-				return $this->sendResponse(WbwTemplateResource::collection($wbw),"ok");
-				break;
-			case "page":
-				$wbw = WbwTemplate::where("word","like","%".$request->get('num'))->get(['book','paragraph']);
-				return $this->sendResponse(WbwTemplateResource::collection($wbw),"ok");
-				break;
-		}
+        switch ($request->input('view')) {
+            case "para":
+                $wbw = WbwTemplate::where("book", $request->input('book'))
+                    ->where("paragraph", $request->input('paragraph'))
+                    ->get(['wid', 'word', 'real']);
+                return $this->sendResponse(WbwTemplateResource::collection($wbw), "ok");
+                break;
+            case "word":
+                $wbw = WbwTemplate::where("word", $request->input('word'))->get(['book', 'paragraph']);
+                return $this->sendResponse(WbwTemplateResource::collection($wbw), "ok");
+                break;
+            case "page":
+                $wbw = WbwTemplate::where("word", "like", "%" . $request->input('num'))->get(['book', 'paragraph']);
+                return $this->sendResponse(WbwTemplateResource::collection($wbw), "ok");
+                break;
+        }
     }
 
     /**
@@ -55,13 +55,12 @@ class WbwTemplateController extends Controller
     public function show($id)
     {
         //
-		$para = explode('-',$id);
-		$wbw = WbwTemplate::where("book",$para[0])
-		->where("paragraph",$para[1])
-		->where("wid",$para[2])
-		->get();
-		return $this->sendResponse(WbwTemplateResource::collection($wbw),"ok");
-
+        $para = explode('-', $id);
+        $wbw = WbwTemplate::where("book", $para[0])
+            ->where("paragraph", $para[1])
+            ->where("wid", $para[2])
+            ->get();
+        return $this->sendResponse(WbwTemplateResource::collection($wbw), "ok");
     }
 
     /**

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

@@ -17,24 +17,24 @@ class WebHookController extends Controller
      */
     public function index(Request $request)
     {
-		switch ($request->get('view')) {
+        switch ($request->input('view')) {
             case 'channel':
-                $table = WebHook::where('res_type','channel')->where('res_id',$request->get('id'));
+                $table = WebHook::where('res_type', 'channel')->where('res_id', $request->input('id'));
                 break;
             default:
                 return $this->error("no view");
                 break;
         }
-        if(!empty($search)){
-            $table->where('url', 'like', $search."%");
+        if (!empty($search)) {
+            $table->where('url', 'like', $search . "%");
         }
-        $table->orderBy($request->get('order','updated_at'),$request->get('dir','desc'));
+        $table->orderBy($request->input('order', 'updated_at'), $request->input('dir', 'desc'));
         $count = $table->count();
-        $table->skip($request->get("offset",0))
-              ->take($request->get('limit',1000));
+        $table->skip($request->input("offset", 0))
+            ->take($request->input('limit', 1000));
 
         $result = $table->get();
-        return $this->ok(["rows"=>WebHookResource::collection($result),"count"=>$count]);
+        return $this->ok(["rows" => WebHookResource::collection($result), "count" => $count]);
     }
 
     /**
@@ -47,8 +47,8 @@ class WebHookController extends Controller
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error(__('auth.failed'),[],401);
+        if (!$user) {
+            return $this->error(__('auth.failed'), [], 401);
         }
 
         $validated = $request->validate([
@@ -64,12 +64,12 @@ class WebHookController extends Controller
         $new->res_id = $validated['res_id'];
         $new->url = $validated['url'];
         $new->receiver = $validated['receiver'];
-        if($request->has('event')){
-            $new->event = json_encode($request->get('event'),JSON_UNESCAPED_UNICODE);
-        }else{
+        if ($request->has('event')) {
+            $new->event = json_encode($request->input('event'), JSON_UNESCAPED_UNICODE);
+        } else {
             $new->event = null;
         }
-        $new->status = $request->get('status','active');
+        $new->status = $request->input('status', 'active');
         $new->editor_uid = $user['user_uid'];
         $new->save();
         return $this->ok(new WebHookResource($new));
@@ -85,7 +85,7 @@ class WebHookController extends Controller
     {
         //
         $webHook = WebHook::find($id);
-        if(!$webHook){
+        if (!$webHook) {
             return $this->error('no id');
         }
         return $this->ok(new WebHookResource($webHook));
@@ -102,8 +102,8 @@ class WebHookController extends Controller
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
-            return $this->error(__('auth.failed'),[],401);
+        if (!$user) {
+            return $this->error(__('auth.failed'), [], 401);
         }
 
         $validated = $request->validate([
@@ -114,19 +114,19 @@ class WebHookController extends Controller
         ]);
         //TODO 判断权限
         $webHook = WebHook::find($id);
-        if(!$webHook){
+        if (!$webHook) {
             return $this->error('no id');
         }
         $webHook->res_type = $validated['res_type'];
         $webHook->res_id = $validated['res_id'];
         $webHook->url = $validated['url'];
         $webHook->receiver = $validated['receiver'];
-        if($request->has('event')){
-            $webHook->event = json_encode($request->get('event'),JSON_UNESCAPED_UNICODE);
-        }else{
+        if ($request->has('event')) {
+            $webHook->event = json_encode($request->input('event'), JSON_UNESCAPED_UNICODE);
+        } else {
             $webHook->event = null;
         }
-        $webHook->status = $request->get('status');
+        $webHook->status = $request->input('status');
         $webHook->editor_uid = $user['user_uid'];
         $webHook->save();
         return $this->ok(new WebHookResource($webHook));
@@ -138,15 +138,15 @@ class WebHookController extends Controller
      * @param  \App\Models\WebHook  $webHook
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Request $request,string $id)
+    public function destroy(Request $request, string $id)
     {
         //
         $user = AuthApi::current($request);
-        if(!$user){
+        if (!$user) {
             return $this->error(__('auth.failed'));
         }
         $webHook = WebHook::find($id);
-        if(!$webHook){
+        if (!$webHook) {
             return $this->error('no id');
         }
         //TODO 判断当前用户是否有权限

api-v12/app/Http/Controllers/WordIndexController.php

@@ -16,9 +16,9 @@ class WordIndexController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->get("view")) {
+        switch ($request->input("view")) {
             case 'key':
-                $key = $request->get("key");
+                $key = $request->input("key");
                 /*
                 $result = Cache::remember("/word_index/{$key}",10,function() use($key){
                     return WordIndex::where('word','like',$key."%")