1

app/JsonRpc/FooterService.php

@@ -167,11 +167,13 @@ class FooterService implements FooterServiceInterface
      */
     public function getFooterContent(array $data): array
     {
-        if(isset($data['con_title'])){
-            $rep = FooterContent::where('con_title', 'like', '%'.$data['con_title'].'%')
+
+        if(isset($data['list_title'])){
+            $rep = FooterContent::where('list_title', 'like', '%'.$data['list_title'].'%')
             ->where('fcat_id', $data['fcat_id'])
             ->limit($data['pageSize'])->offset(($data['page']-1)*$data['pageSize'])
             ->orderBy("updated_at","desc")->get();
+            
         }else{
             $rep = FooterContent::where('fcat_id', $data['fcat_id'])
             ->limit($data['pageSize'])->offset(($data['page']-1)*$data['pageSize'])
@@ -187,6 +189,23 @@ class FooterService implements FooterServiceInterface
             ];
             return Result::success($result);
         }
+    }
+     /**
+     * 获取某个底部导航（列表）内容
+     * @param array $data
+     * @return array
+     */
+    public function getOneFooterContent(array $data): array
+    {      
+        $result = FooterContent::where('footer_content.id', $data['id'])
+        ->leftJoin('footer_category','footer_category.id','fcat_id')
+        ->select('footer_content.*','footer_category.type')
+        ->first();   
+        if(empty($result)){
+            return Result::error("请输入正确的底部导航内容id！");
+        }else{
+            return Result::success($result);
+        }
     }
     /**
      * 编辑底部导航（列表）内容

app/JsonRpc/FooterServiceInterface.php

@@ -34,6 +34,11 @@ interface FooterServiceInterface
      * @return array
      */
     public function addFooterContent(array $data): array;
+    /**
+     * @param int $data
+     * @return array
+     */
+    public function getOneFooterContent(array $data): array;
     /**
      * @param int $data
      * @return array

app/JsonRpc/WebsiteService.php

@@ -1418,7 +1418,9 @@ class WebsiteService implements WebsiteServiceInterface
         if(empty($website)){
             $message = "请输入正确的网站id！";
         }else{
-            $where = $data["page_type"];
+            $page_type = WebsiteTemplateInfo::where('website_id',$data['website_id'])->select('page_type')->first();
+            $where = json_decode($page_type['page_type'], true);
+            // $where = $data["page_type"];
             if(isset($data['template_class_id'])){
                 $template_class = TemplateClass::where('id',$data['template_class_id'])->first();
                 if(empty($template_class)){
@@ -1450,7 +1452,7 @@ class WebsiteService implements WebsiteServiceInterface
                     ->orderBy("template.updated_at", "desc")
                     ->get();
             }
-            if(empty($rep)){
+            if(empty($rep->toArray())){
                 $message = "没有查找到相关数据！";
             }else{
                 $result = [

runtime/hyperf.pid

@@ -1 +0,0 @@
-34250

runtime/logs/hyperf.log

@@ -0,0 +1,116 @@
+[2024-11-21T07:56:29.674152+00:00] sql.INFO: [87.21] select * from `letter_type` where (`type` = '1') order by `sort` asc [] []
+[2024-11-21T07:56:40.645759+00:00] sql.INFO: [18.18] select * from `letter_type` where (`type` = '1' and `pid` = '14') order by `sort` asc [] []
+[2024-11-21T07:56:56.646094+00:00] sql.INFO: [103.6] insert into `letter_of_complaint` (`title`, `nature`, `nature_level0`, `nature_level1`, `nature_level3`, `name`, `id_card`, `mobile`, `describe`, `like_remark`, `judgment`, `audio_and_video`, `contract`, `qualifications`, `money`, `other`, `user_id`) values ('我测试一条', '5', '14', '29', '113', '1', '1', '15801245755', '111', '111111111', '', '', '', '', '1', '111', '71') [] []
+[2024-12-24T13:38:22.634084+08:00] sql.INFO: [79.99] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:38:22.689694+08:00] sql.INFO: [36.89] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:38:22.711460+08:00] sql.INFO: [16.96] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:38:22.768086+08:00] sql.INFO: [48.59] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:39:53.822180+08:00] sql.INFO: [60.11] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:39:53.851174+08:00] sql.INFO: [14.23] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:39:53.873007+08:00] sql.INFO: [17.99] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:39:53.905074+08:00] sql.INFO: [15.48] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:40:29.035491+08:00] sql.INFO: [443.27] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:40:29.050704+08:00] sql.INFO: [13.92] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:40:29.066201+08:00] sql.INFO: [14.5] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:40:29.082003+08:00] sql.INFO: [14.57] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:40:32.760724+08:00] sql.INFO: [273.17] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:40:32.792413+08:00] sql.INFO: [13.11] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:40:33.027042+08:00] sql.INFO: [229.51] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:40:33.049934+08:00] sql.INFO: [14.05] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:40:36.881674+08:00] sql.INFO: [16.09] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:40:36.897432+08:00] sql.INFO: [15] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:40:36.914405+08:00] sql.INFO: [16.1] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:40:36.931625+08:00] sql.INFO: [16.38] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:40:37.944832+08:00] sql.INFO: [17.12] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:40:37.960917+08:00] sql.INFO: [15.07] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:40:37.978779+08:00] sql.INFO: [17.08] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:40:37.993706+08:00] sql.INFO: [14.02] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:40:47.993354+08:00] sql.INFO: [16.37] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:40:48.010136+08:00] sql.INFO: [15.9] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:40:48.025318+08:00] sql.INFO: [14.2] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:40:48.040959+08:00] sql.INFO: [14.76] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:40:51.473421+08:00] sql.INFO: [62.52] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:40:51.509013+08:00] sql.INFO: [14.85] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:40:51.528517+08:00] sql.INFO: [15.39] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:40:51.550630+08:00] sql.INFO: [14.68] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:44:40.362406+08:00] sql.INFO: [274.5] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:44:40.395454+08:00] sql.INFO: [12.97] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:44:40.415902+08:00] sql.INFO: [15.16] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:44:40.438486+08:00] sql.INFO: [14.53] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:45:19.508219+08:00] sql.INFO: [15.65] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:45:19.523411+08:00] sql.INFO: [14.42] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:45:19.537419+08:00] sql.INFO: [13.23] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:45:19.553641+08:00] sql.INFO: [15.44] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:45:20.472967+08:00] sql.INFO: [15.08] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:45:20.487884+08:00] sql.INFO: [14.03] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:45:20.503788+08:00] sql.INFO: [14.76] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:45:20.519355+08:00] sql.INFO: [14.51] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:45:23.732678+08:00] sql.INFO: [63.21] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:45:23.765329+08:00] sql.INFO: [14.55] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:45:23.783733+08:00] sql.INFO: [13.77] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:45:23.808719+08:00] sql.INFO: [15.31] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:46:11.084932+08:00] sql.INFO: [1078.32] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:46:11.114677+08:00] sql.INFO: [13.82] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:46:11.134593+08:00] sql.INFO: [15.01] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:46:11.163998+08:00] sql.INFO: [22.13] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:46:12.408560+08:00] sql.INFO: [18.08] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:46:12.425032+08:00] sql.INFO: [15.64] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:46:12.442945+08:00] sql.INFO: [16.96] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:46:12.459024+08:00] sql.INFO: [15.08] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:46:13.453325+08:00] sql.INFO: [16.57] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:46:13.470109+08:00] sql.INFO: [15.83] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:46:13.487027+08:00] sql.INFO: [15.96] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:46:13.504194+08:00] sql.INFO: [16.19] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:46:14.536994+08:00] sql.INFO: [17.9] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:46:14.555222+08:00] sql.INFO: [17.07] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:46:14.571215+08:00] sql.INFO: [14.98] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:46:14.589109+08:00] sql.INFO: [16.94] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:46:15.678312+08:00] sql.INFO: [19.65] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:46:15.695034+08:00] sql.INFO: [15.95] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:46:15.711858+08:00] sql.INFO: [15.89] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:46:15.727706+08:00] sql.INFO: [14.81] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:46:16.757892+08:00] sql.INFO: [18.49] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:46:16.779208+08:00] sql.INFO: [20.45] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:46:16.797165+08:00] sql.INFO: [16.83] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:46:17.029538+08:00] sql.INFO: [231.42] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:46:30.605689+08:00] sql.INFO: [17.02] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:46:30.622953+08:00] sql.INFO: [16.35] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:46:30.639751+08:00] sql.INFO: [16.04] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:46:30.872466+08:00] sql.INFO: [232] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:46:34.520341+08:00] sql.INFO: [60.35] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:46:34.558262+08:00] sql.INFO: [20.07] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:46:34.576290+08:00] sql.INFO: [13.68] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:46:34.813676+08:00] sql.INFO: [229.54] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:47:09.093318+08:00] sql.INFO: [67.46] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:47:09.127195+08:00] sql.INFO: [15.47] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:47:09.144843+08:00] sql.INFO: [13.05] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:47:09.170847+08:00] sql.INFO: [15.14] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:47:18.894778+08:00] sql.INFO: [500.7] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:47:19.138737+08:00] sql.INFO: [228.58] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:47:19.156782+08:00] sql.INFO: [12.85] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:47:19.177964+08:00] sql.INFO: [13.93] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:47:48.725239+08:00] sql.INFO: [17.81] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:47:48.746814+08:00] sql.INFO: [20.82] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:47:49.188029+08:00] sql.INFO: [440.42] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:47:49.204192+08:00] sql.INFO: [14.96] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"[\"1\", \"2\"]"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:47:53.407482+08:00] sql.INFO: [1782.33] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:47:53.436715+08:00] sql.INFO: [13.99] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:47:53.456487+08:00] sql.INFO: [15.24] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:47:53.478924+08:00] sql.INFO: [14.94] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"1"}') and json_contains(`template_img`, '{"value":"2"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:48:24.740117+08:00] sql.INFO: [482.4] select * from `website` where `website`.`id` = '1' limit 1 [] []
+[2024-12-24T13:48:24.769849+08:00] sql.INFO: [13.56] select `page_type` from `website_template_info` where `website_id` = '1' limit 1 [] []
+[2024-12-24T13:48:24.788100+08:00] sql.INFO: [13.82] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:48:25.028621+08:00] sql.INFO: [230.87] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"1"}') and json_contains(`template_img`, '{"value":"2"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:50:20.265393+08:00] sql.INFO: [57.37] select * from `website` where `website`.`id` = '2' limit 1 [] []
+[2024-12-24T13:50:20.280099+08:00] sql.INFO: [13.57] select `page_type` from `website_template_info` where `website_id` = '2' limit 1 [] []
+[2024-12-24T13:50:20.293684+08:00] sql.INFO: [12.86] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:50:20.310753+08:00] sql.INFO: [16.16] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"1"}') and json_contains(`template_img`, '{"value":"2"}') and json_contains(`template_img`, '{"value":"3"}') and json_contains(`template_img`, '{"value":"4"}') and json_contains(`template_img`, '{"value":"5"}') and json_contains(`template_img`, '{"value":"6"}') and json_contains(`template_img`, '{"value":"7"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:50:50.676845+08:00] sql.INFO: [60.04] select * from `website` where `website`.`id` = '2' limit 1 [] []
+[2024-12-24T13:50:50.711226+08:00] sql.INFO: [17.1] select `page_type` from `website_template_info` where `website_id` = '2' limit 1 [] []
+[2024-12-24T13:50:50.730315+08:00] sql.INFO: [13.83] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:50:50.757449+08:00] sql.INFO: [17.16] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"1"}') and json_contains(`template_img`, '{"value":"2"}') and json_contains(`template_img`, '{"value":"3"}') and json_contains(`template_img`, '{"value":"4"}') and json_contains(`template_img`, '{"value":"5"}') and json_contains(`template_img`, '{"value":"6"}') and json_contains(`template_img`, '{"value":"7"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T13:51:12.102784+08:00] sql.INFO: [63.27] select * from `website` where `website`.`id` = '2' limit 1 [] []
+[2024-12-24T13:51:12.135561+08:00] sql.INFO: [13.71] select `page_type` from `website_template_info` where `website_id` = '2' limit 1 [] []
+[2024-12-24T13:51:12.155510+08:00] sql.INFO: [14.54] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T13:51:12.180296+08:00] sql.INFO: [16.18] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"1"}') and json_contains(`template_img`, '{"value":"2"}') and json_contains(`template_img`, '{"value":"3"}') and json_contains(`template_img`, '{"value":"4"}') and json_contains(`template_img`, '{"value":"5"}') and json_contains(`template_img`, '{"value":"6"}') and json_contains(`template_img`, '{"value":"7"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T14:05:40.108246+08:00] sql.INFO: [1781.51] select * from `footer_content` where `fcat_id` = '12' order by `updated_at` desc limit 10 offset 0 [] []

vendor/composer/installed.php

@@ -3,7 +3,15 @@
         'name' => 'hyperf/hyperf-skeleton',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
+<<<<<<< HEAD
         'reference' => '15d1617044764e9d720c9c677f1317b4a9419a46',
+=======
+<<<<<<< HEAD
+        'reference' => '4bdced194db9377c80023b13d9edf9b6bc342d41',
+=======
+        'reference' => '452c3aad61513066c145fd9a77d1bae540191494',
+>>>>>>> 20241213_fr_diyweb
+>>>>>>> b6e4b817068a1bd4d25a07603200740429cdc2a0
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -439,7 +447,15 @@
         'hyperf/hyperf-skeleton' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
+<<<<<<< HEAD
             'reference' => '15d1617044764e9d720c9c677f1317b4a9419a46',
+=======
+<<<<<<< HEAD
+            'reference' => '4bdced194db9377c80023b13d9edf9b6bc342d41',
+=======
+            'reference' => '452c3aad61513066c145fd9a77d1bae540191494',
+>>>>>>> 20241213_fr_diyweb
+>>>>>>> b6e4b817068a1bd4d25a07603200740429cdc2a0
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),