gx

@@ -7,7 +7,9 @@
  */
  */
 namespace App\Console\Commands\Test;
 namespace App\Console\Commands\Test;
 
 
+use App\Models\Blog\Blog;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
+use App\Models\File\Image;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use GuzzleHttp\Client;
 use GuzzleHttp\Client;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
@@ -44,6 +46,13 @@ class Demo extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
+        echo time() . PHP_EOL;
+        $blogModel = new Image();
+        $list = $blogModel->list();
+        echo time() . PHP_EOL;
+        dd(count($list));
+
+        return;
         preg_match_all("/\@include\(\"([a-z0-9_]+)\"\)/i",'
         preg_match_all("/\@include\(\"([a-z0-9_]+)\"\)/i",'
 @include("asdf")@include("")@include("asdtrw2erf")
 @include("asdf")@include("")@include("asdtrw2erf")
         ',$include);
         ',$include);

@@ -24,7 +24,7 @@ class KeywordPrefixController extends BaseController
      */
      */
     public function getKeywordPrefix(){
     public function getKeywordPrefix(){
         $keywordPrefixModel = new KeywordPrefix();
         $keywordPrefixModel = new KeywordPrefix();
-        $list = $keywordPrefixModel->list($this->map);
+        $list = $keywordPrefixModel->list($this->map,'id',['id','name']);
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
 }
 }

@@ -51,7 +51,6 @@ class TaskController extends BaseController
 
 
         $sort = ['id' => 'desc'];
         $sort = ['id' => 'desc'];
         $data = $logic->getUserlist($map, $sort, ['*']);
         $data = $logic->getUserlist($map, $sort, ['*']);
-
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 

@@ -40,20 +40,20 @@ class TaskLogic extends BaseLogic
             ->groupBy('gto.manage_id')
             ->groupBy('gto.manage_id')
             ->paginate($limit)->toArray();
             ->paginate($limit)->toArray();
         $list = [];
         $list = [];
-        $map = array_map(function ($v) {
-            if(!Str::startsWith($v[0], 'gto.')) {
-                return $v;
-            }
-            return [];
-        }, $map);
-        $map = array_filter($map);
+//        $map = array_map(function ($v) {
+//            if(!Str::startsWith($v[0], 'gto.')) {
+//                return $v;
+//            }
+//            return [];
+//        }, $map);
+//        $map = array_filter($map);
         foreach ($data['list'] as $v){
         foreach ($data['list'] as $v){
-            $map[] = ['id', 'in', TaskOwner::where('manage_id', $v['manage_id'])->pluck('task_id')->toArray()];
+            $maps[] = ['id', 'in', TaskOwner::where('manage_id', $v['manage_id'])->pluck('task_id')->toArray()];
             $list[] = [
             $list[] = [
                 "manage_id" => $v['manage_id'],
                 "manage_id" => $v['manage_id'],
                 "manage_id_text" => (new ManageLogic)->getCacheName($v['manage_id']),
                 "manage_id_text" => (new ManageLogic)->getCacheName($v['manage_id']),
                 "count" => $v['count'],
                 "count" => $v['count'],
-                "task_list" => $this->getList($map, $sort, $columns)['list'] ?? []
+                "task_list" => $this->getList($maps, $sort, $columns)['list'] ?? []
             ];
             ];
         }
         }
         return $this->success($list);
         return $this->success($list);