merge master

.gitignore

@@ -9,6 +9,7 @@ bin-release/
 vendor
 public
 runtime
+runtime/
 runtime/*
 runtime/logs/hyperf.log
 # Executables
@@ -20,9 +21,11 @@ runtime/logs/hyperf.log
 # Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
 # should NOT be excluded as they contain compiler settings and other important
 # information for Eclipse / Flash Builder.
+
+runtime/container/classes.cache
+runtime/container/scan.cache
 runtime/hyperf.pid
-runtime/hyperf.pid
-runtime/hyperf.pid
+runtime/container/aspects.cache
 runtime/container/classes.cache
 runtime/container/scan.cache
 runtime

app/JsonRpc/PublicRpcService.php

@@ -20,12 +20,11 @@ class PublicRpcService implements PublicRpcServiceInterface
      */
     public function getDistrictList(array $data): array
     {
-
         $where = [];
-        if(isset($data['keyWord'])){
-            $where = [
-                ['name','like','%'.$data['keyWord'].'%']
-            ];
+       if(isset($data['keyWord'])){
+           $where = [
+               ['name','like','%'.$data['keyWord'].'%']
+           ];
         }
         $result  = [];
         if(isset($data['pageSize'])){
@@ -34,6 +33,7 @@ class PublicRpcService implements PublicRpcServiceInterface
             $result = [
                 'rows'=>$rep,
                 'count'=>$count
+
             ];
         }else{
             $result = District::where($data)->orderBy("code","asc")->get();
@@ -478,4 +478,24 @@ class PublicRpcService implements PublicRpcServiceInterface
             return Result::success();
         }
     }
+
+
+    /**
+     * 查询职能列表
+     * @param array $data
+     * @return array
+     */
+    public function getDepartment(array $data) :array
+    {
+        $where = [
+            'pid'=>$data['pid']??0
+        ];
+        $result = Department::where($where)->orderBy("sort","desc")->get();
+        if (empty($result)) {
+            return Result::error("查询失败", 0);
+        }else{
+            return Result::success($result);
+        }
+    }
 }
+

app/JsonRpc/PublicRpcServiceInterface.php

@@ -98,9 +98,11 @@ interface PublicRpcServiceInterface
      * @return array
      */
 
+    public function getZhinengbumenList(array $data): array;
+
     public function getDepartment(array $data): array;
 
-    public function getZhinengbumenList(array $data): array;
+
 
     /**
      * @param array $data

app/Model/Department.php

@@ -7,40 +7,39 @@ namespace App\Model;
 use Hyperf\DbConnection\Model\Model;
 
 /**
-
- * @property int $id
- * @property int $pid
- * @property string $name
- * @property string $dir_name
- * @property int $fid
- * @property int $fup
- * @property int $mid
- * @property int $class
- * @property int $sons
- * @property int $type
- * @property string $admin
- * @property int $list
- * @property int $listorder
- * @property string $passwd
- * @property string $logo
- * @property string $descrip
- * @property string $style
- * @property string $template
- * @property string $jumpurl
- * @property int $maxperpage
- * @property string $metakeywords
- * @property string $metadescription
- * @property int $allowcomment
- * @property string $allowpost
- * @property string $allowviewtitle
- * @property string $allowviewcontent
- * @property string $allowdownload
- * @property int $forbidshow
- * @property string $config
- * @property int $index_show
- * @property int $contents
- * @property string $tableid
- * @property int $sort
+ * @property int $id 
+ * @property int $pid 
+ * @property string $name 
+ * @property string $dir_name 
+ * @property int $fid 
+ * @property int $fup 
+ * @property int $mid 
+ * @property int $class 
+ * @property int $sons 
+ * @property int $type 
+ * @property string $admin 
+ * @property int $list 
+ * @property int $listorder 
+ * @property string $passwd 
+ * @property string $logo 
+ * @property string $descrip 
+ * @property string $style 
+ * @property string $template 
+ * @property string $jumpurl 
+ * @property int $maxperpage 
+ * @property string $metakeywords 
+ * @property string $metadescription 
+ * @property int $allowcomment 
+ * @property string $allowpost 
+ * @property string $allowviewtitle 
+ * @property string $allowviewcontent 
+ * @property string $allowdownload 
+ * @property int $forbidshow 
+ * @property string $config 
+ * @property int $index_show 
+ * @property int $contents 
+ * @property string $tableid 
+ * @property int $sort 
 
  */
 class Department extends Model
@@ -58,5 +57,6 @@ class Department extends Model
     /**
      * The attributes that should be cast to native types.
      */
-    protected array $casts = [];
+    protected array $casts = ['id' => 'integer', 'pid' => 'integer', 'fid' => 'integer', 'fup' => 'integer', 'mid' => 'integer', 'class' => 'integer', 'sons' => 'integer', 'type' => 'integer', 'list' => 'integer', 'listorder' => 'integer', 'maxperpage' => 'integer', 'allowcomment' => 'integer', 'forbidshow' => 'integer', 'index_show' => 'integer', 'contents' => 'integer', 'sort' => 'integer'];
+
 }

runtime/hyperf.pid

@@ -1 +1 @@
-5358
+1874

runtime/logs/hyperf.log

@@ -1,3 +1,32 @@
+<<<<<<< HEAD
+ [2024-10-24T02:01:08.461639+00:00] sql.INFO: [298.43] select count(*) as aggregate from `department` [] []
+[2024-10-24T02:01:08.487681+00:00] sql.INFO: [25.45] select * from `department` limit 10 offset 0 [] []
+[2024-10-24T02:04:18.232542+00:00] sql.INFO: [54.05] select count(*) as aggregate from `department` [] []
+[2024-10-24T02:04:18.265706+00:00] sql.INFO: [32.72] select * from `department` limit 10 offset 0 [] []
+[2024-10-24T02:04:19.985643+00:00] sql.INFO: [12.87] select count(*) as aggregate from `department` [] []
+[2024-10-24T02:04:20.007976+00:00] sql.INFO: [21.88] select * from `department` limit 10 offset 0 [] []
+[2024-10-24T02:04:48.017665+00:00] sql.INFO: [14.44] select count(*) as aggregate from `department` [] []
+[2024-10-24T02:04:48.294035+00:00] sql.INFO: [275.73] select * from `department` limit 10 offset 0 [] []
+[2024-10-24T02:04:54.843226+00:00] sql.INFO: [105.07] select count(*) as aggregate from `department` [] []
+[2024-10-24T02:04:54.909293+00:00] sql.INFO: [62.98] select * from `department` limit 10 offset 0 [] []
+[2024-10-24T02:58:53.813582+00:00] sql.INFO: [97.62] select count(*) as aggregate from `department` [] []
+[2024-10-24T02:58:53.843095+00:00] sql.INFO: [23.83] select * from `department` limit 10 offset 0 [] []
+[2024-10-24T03:02:05.875325+00:00] sql.INFO: [88.7] select count(*) as aggregate from `department` [] []
+[2024-10-24T03:02:05.900659+00:00] sql.INFO: [24.89] select * from `department` limit 10 offset 0 [] []
+[2024-10-24T05:08:35.310025+00:00] sql.INFO: [82.81] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` where (`website`.`website_name` like '%ww%' and `website`.`website_column_id` = '1' and `website`.`city_id` = '1') limit 10 offset 0 [] []
+[2024-10-24T05:08:35.330477+00:00] sql.INFO: [13.95] select count(*) as aggregate from `website` where (`website`.`website_name` like '%ww%' and `website`.`website_column_id` = '1' and `website`.`city_id` = '1') [] []
+[2024-10-24T05:09:00.588508+00:00] sql.INFO: [60.28] select count(*) as aggregate from `department` [] []
+[2024-10-24T05:09:00.615327+00:00] sql.INFO: [26.25] select * from `department` limit 10 offset 0 [] []
+[2024-10-24T05:09:22.085076+00:00] sql.INFO: [90] select count(*) as aggregate from `department` [] []
+[2024-10-24T05:09:22.115178+00:00] sql.INFO: [24.61] select * from `department` limit 10 offset 0 [] []
+[2024-10-24T05:10:21.430133+00:00] sql.INFO: [17.46] select count(*) as aggregate from `department` where `name` like '%林业%' [] []
+[2024-10-24T05:10:21.449014+00:00] sql.INFO: [18.18] select * from `department` where `name` like '%林业%' limit 20 offset 0 [] []
+[2024-10-24T05:17:55.894583+00:00] sql.INFO: [55.46] select count(*) as aggregate from `department` [] []
+[2024-10-24T05:17:55.918136+00:00] sql.INFO: [23.04] select * from `department` limit 10 offset 0 [] []
+[2024-10-24T07:51:17.304597+00:00] sql.INFO: [1924.46] insert into `department` (`pid`, `name`) values ('1', '测试') [] []
+[2024-10-24T08:10:01.688786+00:00] sql.INFO: [14.09] insert into `department` (`pid`, `name`, `sort`) values ('1', '测试', '0') [] []
+[2024-10-24T08:19:31.192745+00:00] sql.INFO: [1510.67] delete from `department` where `id` = '932' [] []
+=======
 [2024-10-29T05:42:47.426053+00:00] sql.INFO: [7.32] select * from `letter_type` where (`type` = '2') [] []
 [2024-10-29T05:42:47.438486+00:00] sql.INFO: [4.9] select * from `letter_type` where (`type` = '10') [] []
 [2024-10-29T05:42:47.438490+00:00] sql.INFO: [4.93] select * from `letter_type` where (`type` = '1') [] []
@@ -7585,3 +7614,174 @@
 [2024-11-08T10:21:02.802067+00:00] sql.INFO: [1.44] select * from `category` where (`pid` = '16') [] []
 [2024-11-08T10:21:02.803824+00:00] sql.INFO: [1.37] select * from `category` where `id` in ('2', '40', '8', '9', '1', '51', '41', '10', '3', '45', '16') [] []
 [2024-11-08T10:21:02.812007+00:00] sql.INFO: [5.98] insert into `website_category` (`alias`, `category_id`, `name`, `pid`, `pid_arr`, `seo_description`, `seo_keywords`, `seo_title`, `sort`, `website_id`) values ('政策法规', '1', '政策法规', '0', '[0]', '政策法规', '政策法规', '政策法规', '1', '79'), ('三农之窗', '2', '三农之窗', '0', '[0]', '法务信息', '法务信息', '法务信息', '1', '79'), ('测试', '3', '测试', '1', '[1]', '1', '1', '1', '1', '79'), ('刘佳伟钱多到花不完', '8', '刘佳伟钱多到花不完', '2', '[2]', '2222222222222', '22222222222222222', '2222222222', '30', '79'), ('四级', '9', '四级', '8', '[5,7,8]', '111', '11', '11', '1', '79'), ('政务信息2', '10', '政务信息2', '1', '[1]', '33', '22', '11', '0', '79'), ('三农探索', '16', '三农探索', '0', '[0]', '三农探索', '三农探索', '三农探索', '0', '79'), ('ceshi', '40', 'ceshi', '2', '{"0":"1","2":"2"}', '描述', '关键词', '标题', '0', '79'), ('刘佳伟亲自测试2', '41', '刘佳伟亲自测试2', '1', '[1]', '测试描述', '测试关键词', '测试标题3', '2', '79'), ('政策法规', '45', '政策法规', '3', '[0]', '政策法规', '政策法规', '政策法规', '1', '79'), ('测试数据', '51', '测试数据', '1', '[1]', '错了', '错了', '错了', '0', '79') [] []
+[2024-11-09T00:56:02.895510+00:00] sql.INFO: [12.95] select count(*) as aggregate from `website` [] []
+[2024-11-09T00:56:03.614324+00:00] sql.INFO: [32.84] select count(*) as aggregate from `article` where `status` not in ('404') [] []
+[2024-11-09T00:56:03.626496+00:00] sql.INFO: [3.98] select count(*) as aggregate from `category` [] []
+[2024-11-09T00:56:03.636793+00:00] sql.INFO: [5.73] SELECT  DATE(created_at) AS date,COUNT(*) AS total_count FROM  article  WHERE  created_at >= CURDATE() - INTERVAL 30 DAY  GROUP BY  DATE(created_at)  ORDER BY  date ASC; [] []
+[2024-11-09T00:56:03.649079+00:00] sql.INFO: [4.12] select count(*) as counts,type_id from `user` group by `type_id` [] []
+[2024-11-09T00:56:08.764859+00:00] sql.INFO: [3.87] select * from `website_column` [] []
+[2024-11-09T00:56:08.859039+00:00] sql.INFO: [93.52] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` order by `website`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T00:56:08.865893+00:00] sql.INFO: [3.36] select count(*) as aggregate from `website` [] []
+[2024-11-09T00:56:08.945381+00:00] sql.INFO: [90.24] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T01:19:10.374631+00:00] sql.INFO: [15.83] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T01:19:10.387265+00:00] sql.INFO: [23.69] select * from `department` where (`pid` = '0') order by `sort` desc [] []
+[2024-11-09T01:19:28.815701+00:00] sql.INFO: [4.86] select * from `website_column` [] []
+[2024-11-09T01:19:28.816090+00:00] sql.INFO: [4.65] select * from `website` limit 10 offset 0 [] []
+[2024-11-09T01:19:28.918092+00:00] sql.INFO: [3.39] select `website_id`, `name`, `alias`, `category_id` from `website_category` where `website_category`.`website_id` in (1, 2, 3, 5, 6, 8, 9, 31, 32, 33) and (`pid` = '0') [] []
+[2024-11-09T01:19:28.924619+00:00] sql.INFO: [2.39] select count(*) as aggregate from `website` [] []
+[2024-11-09T01:20:02.298328+00:00] sql.INFO: [4.66] select * from `website` limit 10 offset 0 [] []
+[2024-11-09T01:20:02.303924+00:00] sql.INFO: [2.93] select `website_id`, `name`, `alias`, `category_id` from `website_category` where `website_category`.`website_id` in (1, 2, 3, 5, 6, 8, 9, 31, 32, 33) and (`pid` = '0') [] []
+[2024-11-09T01:20:02.313083+00:00] sql.INFO: [4.6] select count(*) as aggregate from `website` [] []
+[2024-11-09T05:11:20.845629+00:00] sql.INFO: [9.27] select * from `letter_type` where (`type` = '10') [] []
+[2024-11-09T05:11:20.846162+00:00] sql.INFO: [9.45] select * from `letter_type` where (`type` = '2') [] []
+[2024-11-09T05:11:20.846114+00:00] sql.INFO: [9.37] select * from `letter_type` where (`type` = '1') [] []
+[2024-11-09T05:11:20.851451+00:00] sql.INFO: [14.98] select `letter_of_complaint`.*, `type_a`.`type_name` as `nature_name`, `type_b`.`type_name` as `type_name`, `type_c`.`type_name` as `nature_level_name`, `type_d`.`type_name` as `status_name`, `type_e`.`type_name` as `type_level_name` from `letter_of_complaint` left join `letter_type` as `type_a` on `letter_of_complaint`.`nature` = `type_a`.`id` left join `letter_type` as `type_b` on `letter_of_complaint`.`type` = `type_b`.`id` left join `letter_type` as `type_c` on `letter_of_complaint`.`nature_level` = `type_c`.`id` left join `letter_type` as `type_d` on `letter_of_complaint`.`status` = `type_d`.`id` left join `letter_type` as `type_e` on `letter_of_complaint`.`type_level` = `type_e`.`id` order by `letter_of_complaint`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T05:11:20.855256+00:00] sql.INFO: [1.89] select count(*) as aggregate from `letter_of_complaint` [] []
+[2024-11-09T05:11:34.649606+00:00] sql.INFO: [7.04] select `letter_of_complaint`.*, `type_a`.`type_name` as `nature_name`, `type_b`.`type_name` as `type_name`, `type_c`.`type_name` as `nature_level_name`, `type_d`.`type_name` as `status_name`, `type_e`.`type_name` as `type_level_name` from `letter_of_complaint` left join `letter_type` as `type_a` on `letter_of_complaint`.`nature` = `type_a`.`id` left join `letter_type` as `type_b` on `letter_of_complaint`.`type` = `type_b`.`id` left join `letter_type` as `type_c` on `letter_of_complaint`.`nature_level` = `type_c`.`id` left join `letter_type` as `type_d` on `letter_of_complaint`.`status` = `type_d`.`id` left join `letter_type` as `type_e` on `letter_of_complaint`.`type_level` = `type_e`.`id` order by `letter_of_complaint`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T05:11:34.655120+00:00] sql.INFO: [2.78] select count(*) as aggregate from `letter_of_complaint` [] []
+[2024-11-09T05:11:34.662307+00:00] sql.INFO: [2.83] select * from `letter_type` where (`type` = '1') [] []
+[2024-11-09T05:11:34.664072+00:00] sql.INFO: [2.92] select * from `letter_type` where (`type` = '2') [] []
+[2024-11-09T05:11:34.664173+00:00] sql.INFO: [2.79] select * from `letter_type` where (`type` = '10') [] []
+[2024-11-09T05:13:28.107602+00:00] sql.INFO: [16.85] select `letter_of_complaint`.*, `type_a`.`type_name` as `nature_name`, `type_b`.`type_name` as `type_name`, `type_c`.`type_name` as `nature_level_name`, `type_d`.`type_name` as `status_name`, `type_e`.`type_name` as `type_level_name` from `letter_of_complaint` left join `letter_type` as `type_a` on `letter_of_complaint`.`nature` = `type_a`.`id` left join `letter_type` as `type_b` on `letter_of_complaint`.`type` = `type_b`.`id` left join `letter_type` as `type_c` on `letter_of_complaint`.`nature_level` = `type_c`.`id` left join `letter_type` as `type_d` on `letter_of_complaint`.`status` = `type_d`.`id` left join `letter_type` as `type_e` on `letter_of_complaint`.`type_level` = `type_e`.`id` order by `letter_of_complaint`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T05:13:28.113183+00:00] sql.INFO: [3.2] select count(*) as aggregate from `letter_of_complaint` [] []
+[2024-11-09T05:13:28.120109+00:00] sql.INFO: [3.95] select * from `letter_type` where (`type` = '1') [] []
+[2024-11-09T05:13:28.126972+00:00] sql.INFO: [10.73] select * from `letter_type` where (`type` = '2') [] []
+[2024-11-09T05:13:28.131237+00:00] sql.INFO: [12.11] select * from `letter_type` where (`type` = '10') [] []
+[2024-11-09T05:30:17.459889+00:00] sql.INFO: [12.25] select count(*) as aggregate from `website` [] []
+[2024-11-09T05:30:17.464141+00:00] sql.INFO: [3.8] select count(*) as aggregate from `article` where `status` not in ('404') [] []
+[2024-11-09T05:30:17.467737+00:00] sql.INFO: [3.14] select count(*) as aggregate from `category` [] []
+[2024-11-09T05:30:17.471230+00:00] sql.INFO: [3.19] SELECT  DATE(created_at) AS date,COUNT(*) AS total_count FROM  article  WHERE  created_at >= CURDATE() - INTERVAL 30 DAY  GROUP BY  DATE(created_at)  ORDER BY  date ASC; [] []
+[2024-11-09T05:30:17.474604+00:00] sql.INFO: [3.11] select count(*) as counts,type_id from `user` group by `type_id` [] []
+[2024-11-09T05:37:36.331285+00:00] sql.INFO: [11.98] select count(*) as aggregate from `website` [] []
+[2024-11-09T05:37:36.335163+00:00] sql.INFO: [3.33] select count(*) as aggregate from `article` where `status` not in ('404') [] []
+[2024-11-09T05:37:36.337829+00:00] sql.INFO: [2.1] select count(*) as aggregate from `category` [] []
+[2024-11-09T05:37:36.340596+00:00] sql.INFO: [2.44] SELECT  DATE(created_at) AS date,COUNT(*) AS total_count FROM  article  WHERE  created_at >= CURDATE() - INTERVAL 30 DAY  GROUP BY  DATE(created_at)  ORDER BY  date ASC; [] []
+[2024-11-09T05:37:36.342908+00:00] sql.INFO: [1.87] select count(*) as counts,type_id from `user` group by `type_id` [] []
+[2024-11-09T05:40:07.958174+00:00] sql.INFO: [18.12] select count(*) as aggregate from `website` [] []
+[2024-11-09T05:40:07.964924+00:00] sql.INFO: [6.2] select count(*) as aggregate from `article` where `status` not in ('404') [] []
+[2024-11-09T05:40:07.967882+00:00] sql.INFO: [2.54] select count(*) as aggregate from `category` [] []
+[2024-11-09T05:40:07.970909+00:00] sql.INFO: [2.74] SELECT  DATE(created_at) AS date,COUNT(*) AS total_count FROM  article  WHERE  created_at >= CURDATE() - INTERVAL 30 DAY  GROUP BY  DATE(created_at)  ORDER BY  date ASC; [] []
+[2024-11-09T05:40:07.973760+00:00] sql.INFO: [2.51] select count(*) as counts,type_id from `user` group by `type_id` [] []
+[2024-11-09T08:18:35.152604+00:00] sql.INFO: [11.45] select * from `letter_type` where (`type` = '2') [] []
+[2024-11-09T08:18:35.154569+00:00] sql.INFO: [12.7] select * from `letter_type` where (`type` = '1') [] []
+[2024-11-09T08:18:35.157794+00:00] sql.INFO: [16.57] select `letter_of_complaint`.*, `type_a`.`type_name` as `nature_name`, `type_b`.`type_name` as `type_name`, `type_c`.`type_name` as `nature_level_name`, `type_d`.`type_name` as `status_name`, `type_e`.`type_name` as `type_level_name` from `letter_of_complaint` left join `letter_type` as `type_a` on `letter_of_complaint`.`nature` = `type_a`.`id` left join `letter_type` as `type_b` on `letter_of_complaint`.`type` = `type_b`.`id` left join `letter_type` as `type_c` on `letter_of_complaint`.`nature_level` = `type_c`.`id` left join `letter_type` as `type_d` on `letter_of_complaint`.`status` = `type_d`.`id` left join `letter_type` as `type_e` on `letter_of_complaint`.`type_level` = `type_e`.`id` order by `letter_of_complaint`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T08:18:35.158789+00:00] sql.INFO: [17.65] select * from `letter_type` where (`type` = '10') [] []
+[2024-11-09T08:18:35.161233+00:00] sql.INFO: [1.68] select count(*) as aggregate from `letter_of_complaint` [] []
+[2024-11-09T08:52:12.039476+00:00] sql.INFO: [23.15] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T08:52:12.046182+00:00] sql.INFO: [11.54] select * from `website_column` [] []
+[2024-11-09T08:52:12.046722+00:00] sql.INFO: [11.73] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` order by `website`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T08:52:12.053546+00:00] sql.INFO: [4.36] select count(*) as aggregate from `website` [] []
+[2024-11-09T08:53:07.929730+00:00] sql.INFO: [6.89] select count(*) as aggregate from `website` [] []
+[2024-11-09T08:53:07.959959+00:00] sql.INFO: [29.61] select count(*) as aggregate from `article` where `status` not in ('404') [] []
+[2024-11-09T08:53:07.962874+00:00] sql.INFO: [2.56] select count(*) as aggregate from `category` [] []
+[2024-11-09T08:53:07.965974+00:00] sql.INFO: [2.86] SELECT  DATE(created_at) AS date,COUNT(*) AS total_count FROM  article  WHERE  created_at >= CURDATE() - INTERVAL 30 DAY  GROUP BY  DATE(created_at)  ORDER BY  date ASC; [] []
+[2024-11-09T08:53:07.968764+00:00] sql.INFO: [2.49] select count(*) as counts,type_id from `user` group by `type_id` [] []
+[2024-11-09T08:53:10.688422+00:00] sql.INFO: [8.73] select * from `website_column` [] []
+[2024-11-09T08:53:10.688727+00:00] sql.INFO: [9.9] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` order by `website`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T08:53:10.695895+00:00] sql.INFO: [3.99] select count(*) as aggregate from `website` [] []
+[2024-11-09T08:53:10.696022+00:00] sql.INFO: [17.78] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T08:53:17.529023+00:00] sql.INFO: [7.24] select * from `department` where (`pid` = '0') order by `sort` desc [] []
+[2024-11-09T08:53:17.537361+00:00] sql.INFO: [16.53] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T08:53:18.853880+00:00] sql.INFO: [5.76] select * from `website` limit 10 offset 0 [] []
+[2024-11-09T08:53:18.854517+00:00] sql.INFO: [6.11] select * from `website_column` [] []
+[2024-11-09T08:53:18.860988+00:00] sql.INFO: [4.7] select `website_id`, `name`, `alias`, `category_id` from `website_category` where `website_category`.`website_id` in (1, 2, 3, 5, 6, 8, 9, 31, 32, 33) and (`pid` = '0') [] []
+[2024-11-09T08:53:18.868864+00:00] sql.INFO: [3.66] select count(*) as aggregate from `website` [] []
+[2024-11-09T08:53:33.529587+00:00] sql.INFO: [5.53] select * from `website_column` [] []
+[2024-11-09T08:53:33.529844+00:00] sql.INFO: [5.66] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` order by `website`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T08:53:33.535284+00:00] sql.INFO: [3.02] select count(*) as aggregate from `website` [] []
+[2024-11-09T08:53:33.536731+00:00] sql.INFO: [14.31] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T08:53:39.565184+00:00] sql.INFO: [3.98] select * from `letter_type` where (`type` = '2') [] []
+[2024-11-09T08:53:39.565261+00:00] sql.INFO: [4] select * from `letter_type` where (`type` = '1') [] []
+[2024-11-09T08:53:39.571458+00:00] sql.INFO: [10.84] select `letter_of_complaint`.*, `type_a`.`type_name` as `nature_name`, `type_b`.`type_name` as `type_name`, `type_c`.`type_name` as `nature_level_name`, `type_d`.`type_name` as `status_name`, `type_e`.`type_name` as `type_level_name` from `letter_of_complaint` left join `letter_type` as `type_a` on `letter_of_complaint`.`nature` = `type_a`.`id` left join `letter_type` as `type_b` on `letter_of_complaint`.`type` = `type_b`.`id` left join `letter_type` as `type_c` on `letter_of_complaint`.`nature_level` = `type_c`.`id` left join `letter_type` as `type_d` on `letter_of_complaint`.`status` = `type_d`.`id` left join `letter_type` as `type_e` on `letter_of_complaint`.`type_level` = `type_e`.`id` order by `letter_of_complaint`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T08:53:39.576376+00:00] sql.INFO: [2.95] select count(*) as aggregate from `letter_of_complaint` [] []
+[2024-11-09T08:53:39.577233+00:00] sql.INFO: [12.97] select * from `letter_type` where (`type` = '10') [] []
+[2024-11-09T09:00:42.270972+00:00] sql.INFO: [11.91] select * from `letter_type` where (`type` = '1') [] []
+[2024-11-09T09:00:42.271255+00:00] sql.INFO: [12.35] select * from `letter_type` where (`type` = '10') [] []
+[2024-11-09T09:00:42.271316+00:00] sql.INFO: [12.35] select * from `letter_type` where (`type` = '2') [] []
+[2024-11-09T09:00:42.276949+00:00] sql.INFO: [17.03] select `letter_of_complaint`.*, `type_a`.`type_name` as `nature_name`, `type_b`.`type_name` as `type_name`, `type_c`.`type_name` as `nature_level_name`, `type_d`.`type_name` as `status_name`, `type_e`.`type_name` as `type_level_name` from `letter_of_complaint` left join `letter_type` as `type_a` on `letter_of_complaint`.`nature` = `type_a`.`id` left join `letter_type` as `type_b` on `letter_of_complaint`.`type` = `type_b`.`id` left join `letter_type` as `type_c` on `letter_of_complaint`.`nature_level` = `type_c`.`id` left join `letter_type` as `type_d` on `letter_of_complaint`.`status` = `type_d`.`id` left join `letter_type` as `type_e` on `letter_of_complaint`.`type_level` = `type_e`.`id` order by `letter_of_complaint`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T09:00:42.281177+00:00] sql.INFO: [2.19] select count(*) as aggregate from `letter_of_complaint` [] []
+[2024-11-09T09:00:44.514282+00:00] sql.INFO: [5.47] select * from `letter_of_complaint` where (`id` = '111') limit 1 [] []
+[2024-11-09T09:01:06.942038+00:00] sql.INFO: [11.32] select * from `letter_of_complaint` where (`id` = '111') limit 1 [] []
+[2024-11-09T09:04:50.637976+00:00] sql.INFO: [26.06] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:04:50.657557+00:00] sql.INFO: [8.34] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:04:50.677273+00:00] sql.INFO: [8.46] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:04:52.333548+00:00] sql.INFO: [16.13] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:04:52.352303+00:00] sql.INFO: [8.02] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:04:52.844855+00:00] sql.INFO: [18.9] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:04:53.236542+00:00] sql.INFO: [9.43] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:04:56.826635+00:00] sql.INFO: [8.74] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:04:56.845003+00:00] sql.INFO: [7.72] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:04:56.863961+00:00] sql.INFO: [8.03] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:07:21.370353+00:00] sql.INFO: [19.97] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:07:21.374366+00:00] sql.INFO: [3.38] select count(*) as aggregate from `article` where `status` not in ('404') [] []
+[2024-11-09T09:07:21.377317+00:00] sql.INFO: [2.45] select count(*) as aggregate from `category` [] []
+[2024-11-09T09:07:21.380288+00:00] sql.INFO: [2.62] SELECT  DATE(created_at) AS date,COUNT(*) AS total_count FROM  article  WHERE  created_at >= CURDATE() - INTERVAL 30 DAY  GROUP BY  DATE(created_at)  ORDER BY  date ASC; [] []
+[2024-11-09T09:07:21.382515+00:00] sql.INFO: [1.87] select count(*) as counts,type_id from `user` group by `type_id` [] []
+[2024-11-09T09:07:24.469094+00:00] sql.INFO: [8.75] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:07:24.469829+00:00] sql.INFO: [8.61] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` order by `website`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T09:07:24.469885+00:00] sql.INFO: [7.88] select * from `website_column` [] []
+[2024-11-09T09:07:24.474262+00:00] sql.INFO: [2.16] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:21:35.470193+00:00] sql.INFO: [19.74] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:21:35.475232+00:00] sql.INFO: [4.45] select count(*) as aggregate from `article` where `status` not in ('404') [] []
+[2024-11-09T09:21:35.479393+00:00] sql.INFO: [3.67] select count(*) as aggregate from `category` [] []
+[2024-11-09T09:21:35.483778+00:00] sql.INFO: [3.99] SELECT  DATE(created_at) AS date,COUNT(*) AS total_count FROM  article  WHERE  created_at >= CURDATE() - INTERVAL 30 DAY  GROUP BY  DATE(created_at)  ORDER BY  date ASC; [] []
+[2024-11-09T09:21:35.487243+00:00] sql.INFO: [3.1] select count(*) as counts,type_id from `user` group by `type_id` [] []
+[2024-11-09T09:22:15.830384+00:00] sql.INFO: [6.03] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:22:15.834681+00:00] sql.INFO: [3.93] select count(*) as aggregate from `article` where `status` not in ('404') [] []
+[2024-11-09T09:22:15.838074+00:00] sql.INFO: [3.08] select count(*) as aggregate from `category` [] []
+[2024-11-09T09:22:15.841411+00:00] sql.INFO: [3.08] SELECT  DATE(created_at) AS date,COUNT(*) AS total_count FROM  article  WHERE  created_at >= CURDATE() - INTERVAL 30 DAY  GROUP BY  DATE(created_at)  ORDER BY  date ASC; [] []
+[2024-11-09T09:22:15.844259+00:00] sql.INFO: [2.47] select count(*) as counts,type_id from `user` group by `type_id` [] []
+[2024-11-09T09:24:01.506258+00:00] sql.INFO: [9.76] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:24:01.508799+00:00] sql.INFO: [2.17] select count(*) as aggregate from `article` where `status` not in ('404') [] []
+[2024-11-09T09:24:01.510547+00:00] sql.INFO: [1.44] select count(*) as aggregate from `category` [] []
+[2024-11-09T09:24:01.512874+00:00] sql.INFO: [2.09] SELECT  DATE(created_at) AS date,COUNT(*) AS total_count FROM  article  WHERE  created_at >= CURDATE() - INTERVAL 30 DAY  GROUP BY  DATE(created_at)  ORDER BY  date ASC; [] []
+[2024-11-09T09:24:01.514838+00:00] sql.INFO: [1.55] select count(*) as counts,type_id from `user` group by `type_id` [] []
+[2024-11-09T09:25:16.881069+00:00] sql.INFO: [21.17] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` order by `website`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T09:25:16.883763+00:00] sql.INFO: [10.69] select * from `website_column` [] []
+[2024-11-09T09:25:16.885293+00:00] sql.INFO: [1.93] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:25:16.886982+00:00] sql.INFO: [27.57] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:29:39.940347+00:00] sql.INFO: [14.35] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:29:39.944159+00:00] sql.INFO: [3.37] select count(*) as aggregate from `article` where `status` not in ('404') [] []
+[2024-11-09T09:29:39.947137+00:00] sql.INFO: [2.62] select count(*) as aggregate from `category` [] []
+[2024-11-09T09:29:39.950826+00:00] sql.INFO: [3.32] SELECT  DATE(created_at) AS date,COUNT(*) AS total_count FROM  article  WHERE  created_at >= CURDATE() - INTERVAL 30 DAY  GROUP BY  DATE(created_at)  ORDER BY  date ASC; [] []
+[2024-11-09T09:29:39.953473+00:00] sql.INFO: [2.34] select count(*) as counts,type_id from `user` group by `type_id` [] []
+[2024-11-09T09:32:25.770606+00:00] sql.INFO: [11.78] select * from `website_column` [] []
+[2024-11-09T09:32:25.778623+00:00] sql.INFO: [22.5] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:32:25.794919+00:00] sql.INFO: [2.55] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` order by `website`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T09:32:25.798080+00:00] sql.INFO: [1.61] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:33:44.148258+00:00] sql.INFO: [17.49] select * from `website_column` [] []
+[2024-11-09T09:33:44.152417+00:00] sql.INFO: [19.53] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` order by `website`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T09:33:44.154527+00:00] sql.INFO: [26.15] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:33:44.157960+00:00] sql.INFO: [3.09] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:36:33.576994+00:00] sql.INFO: [21.4] select * from `website_column` [] []
+[2024-11-09T09:36:33.578141+00:00] sql.INFO: [22.18] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` order by `website`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T09:36:33.582317+00:00] sql.INFO: [26.67] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:36:33.582623+00:00] sql.INFO: [2.61] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:36:43.478142+00:00] sql.INFO: [4.7] select * from `department` where (`pid` = '0') order by `sort` desc [] []
+[2024-11-09T09:36:43.485339+00:00] sql.INFO: [9.71] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:36:44.738764+00:00] sql.INFO: [3.9] select * from `website` limit 10 offset 0 [] []
+[2024-11-09T09:36:44.739212+00:00] sql.INFO: [4.63] select * from `website_column` [] []
+[2024-11-09T09:36:44.743906+00:00] sql.INFO: [2.94] select `website_id`, `name`, `alias`, `category_id` from `website_category` where `website_category`.`website_id` in (1, 2, 3, 5, 6, 8, 9, 31, 32, 33) and (`pid` = '0') [] []
+[2024-11-09T09:36:44.751408+00:00] sql.INFO: [3.83] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:36:57.230657+00:00] sql.INFO: [11.81] select * from `website_column` [] []
+[2024-11-09T09:36:57.232140+00:00] sql.INFO: [13.76] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` order by `website`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T09:36:57.246205+00:00] sql.INFO: [7.97] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:36:57.249256+00:00] sql.INFO: [31.08] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:40:48.462081+00:00] sql.INFO: [10.97] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:40:48.467875+00:00] sql.INFO: [9.74] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` order by `website`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T09:40:48.471223+00:00] sql.INFO: [10.84] select * from `website_column` [] []
+[2024-11-09T09:40:48.471526+00:00] sql.INFO: [1.85] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:40:48.588470+00:00] sql.INFO: [1.66] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:40:48.590537+00:00] sql.INFO: [1.68] select count(*) as aggregate from `article` where `status` not in ('404') [] []
+[2024-11-09T09:40:48.592208+00:00] sql.INFO: [1.42] select count(*) as aggregate from `category` [] []
+[2024-11-09T09:40:48.594260+00:00] sql.INFO: [1.77] SELECT  DATE(created_at) AS date,COUNT(*) AS total_count FROM  article  WHERE  created_at >= CURDATE() - INTERVAL 30 DAY  GROUP BY  DATE(created_at)  ORDER BY  date ASC; [] []
+[2024-11-09T09:40:48.595883+00:00] sql.INFO: [1.36] select count(*) as counts,type_id from `user` group by `type_id` [] []
+[2024-11-09T09:41:23.692901+00:00] sql.INFO: [7.62] select * from `website_column` [] []
+[2024-11-09T09:41:23.694754+00:00] sql.INFO: [9.24] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` order by `website`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T09:41:23.702649+00:00] sql.INFO: [3.99] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:41:23.704387+00:00] sql.INFO: [19] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-11-09T09:41:25.644045+00:00] sql.INFO: [10.22] select * from `website_column` [] []
+[2024-11-09T09:41:25.644338+00:00] sql.INFO: [10.65] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` order by `website`.`id` desc limit 10 offset 0 [] []
+[2024-11-09T09:41:25.653452+00:00] sql.INFO: [3.99] select count(*) as aggregate from `website` [] []
+[2024-11-09T09:41:25.659283+00:00] sql.INFO: [25.79] select * from `district` where (`pid` = '0') order by `code` asc [] []
+>>>>>>> news_10_8_liu

vendor/composer/installed.php

@@ -3,8 +3,7 @@
         'name' => 'hyperf/hyperf-skeleton',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-
-        'reference' => '9272eb0d9f1d349196e0347d0de7258b37674dc9',
+        'reference' => 'c4c92ee3483e1c5bcad652be05a02e5b2587a966',
 
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
@@ -441,8 +440,7 @@
         'hyperf/hyperf-skeleton' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-
-            'reference' => '9272eb0d9f1d349196e0347d0de7258b37674dc9',
+            'reference' => 'c4c92ee3483e1c5bcad652be05a02e5b2587a966',
 
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',