gitignore

.gitignore

@@ -6,7 +6,8 @@ bin-release/
 
 # Other files and folders
 .settings/
-
+vendor
+public
 # Executables
 *.swf
 *.air

runtime/hyperf.pid

@@ -1 +1,5 @@
-1238
+<<<<<<< HEAD
+1238
+=======
+152
+>>>>>>> 50b6d9d (gitignore)

runtime/logs/hyperf.log

@@ -2795,6 +2795,7 @@
 [2024-07-19T09:49:59.652579+00:00] sql.INFO: [3.24] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
 [2024-07-19T09:50:04.385057+00:00] sql.INFO: [8.24] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
 [2024-07-19T09:50:04.401112+00:00] sql.INFO: [3.9] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+<<<<<<< HEAD
 =======
 [2024-06-28T05:32:34.388520+00:00] sql.INFO: [126.3] select `website`.*, `website_column`.`column_name`, `district`.`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 '%%') limit 10 offset 0 [] []
 [2024-06-28T05:32:34.410331+00:00] sql.INFO: [7.85] select count(*) as aggregate from `website` where (`website`.`website_name` like '%%') [] []
@@ -3772,3 +3773,71 @@
 [2024-07-26T09:05:38.080181+00:00] sql.INFO: [126.57] select count(*) as aggregate from `website` where (`website`.`website_name` like '%%') [] []
 [2024-07-26T09:05:39.979191+00:00] sql.INFO: [5.01] select `website_column`.*, `wc`.`column_name` as `parent_column_name` from `website_column` left join `website_column` as `wc` on `website_column`.`pid` = `wc`.`id` where (`website_column`.`column_name` like '%%') limit 10 offset 0 [] []
 [2024-07-26T09:05:40.024662+00:00] sql.INFO: [2.1] select count(*) as aggregate from `website_column` where (`website_column`.`column_name` like '%%') [] []
+=======
+[2024-07-26T08:25:27.094166+00:00] sql.INFO: [208.55] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-07-26T08:25:27.121682+00:00] sql.INFO: [3.18] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-07-26T08:27:48.119652+00:00] sql.INFO: [46.14] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-07-26T08:27:48.168232+00:00] sql.INFO: [7.71] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-07-26T08:27:50.053406+00:00] sql.INFO: [9.31] select * from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') order by `sort` asc limit 10 offset 0 [] []
+[2024-07-26T08:27:50.072720+00:00] sql.INFO: [4.74] select count(*) as aggregate from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') [] []
+[2024-07-26T08:30:55.543952+00:00] sql.INFO: [61.59] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-07-26T08:30:55.626546+00:00] sql.INFO: [3.53] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-07-26T08:30:57.632562+00:00] sql.INFO: [22] select * from `category` where (`website_id` = '0') [] []
+[2024-07-26T08:31:19.753531+00:00] sql.INFO: [2.33] select * from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') order by `sort` asc limit 10 offset 0 [] []
+[2024-07-26T08:31:19.774304+00:00] sql.INFO: [9.53] select count(*) as aggregate from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') [] []
+[2024-07-26T08:31:21.355278+00:00] sql.INFO: [41.33] select * from `category` where (`website_id` = '0') [] []
+[2024-07-26T08:31:28.075450+00:00] sql.INFO: [20.14] select * from `category` where (`website_id` = '0') [] []
+[2024-07-26T09:11:21.071925+00:00] sql.INFO: [49.31] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-07-26T09:11:21.128166+00:00] sql.INFO: [22.27] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-07-29T06:26:12.826026+00:00] sql.INFO: [459.33] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-07-29T06:26:12.951810+00:00] sql.INFO: [9.18] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-07-29T06:27:14.511326+00:00] sql.INFO: [239.88] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-07-29T06:27:14.568936+00:00] sql.INFO: [22.55] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-07-29T06:27:31.826627+00:00] sql.INFO: [48.79] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-07-29T06:27:31.922604+00:00] sql.INFO: [16.08] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-07-29T06:29:40.710453+00:00] sql.INFO: [45.57] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-07-29T06:29:40.739294+00:00] sql.INFO: [4.09] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-07-30T09:19:38.284285+00:00] sql.INFO: [126.9] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-07-30T09:19:38.316754+00:00] sql.INFO: [6.72] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-07-30T09:19:41.857070+00:00] sql.INFO: [12.61] select * from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') order by `sort` asc limit 10 offset 0 [] []
+[2024-07-30T09:19:41.869116+00:00] sql.INFO: [4.28] select count(*) as aggregate from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') [] []
+[2024-07-30T09:19:48.191701+00:00] sql.INFO: [3.05] select * from `category` where (`website_id` = '0') [] []
+[2024-07-30T09:21:00.907509+00:00] sql.INFO: [37.17] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-07-30T09:21:00.965146+00:00] sql.INFO: [12.48] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-07-30T09:21:06.557808+00:00] sql.INFO: [2.18] select * from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') order by `sort` asc limit 10 offset 0 [] []
+[2024-07-30T09:21:06.624612+00:00] sql.INFO: [39.89] select count(*) as aggregate from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') [] []
+[2024-07-30T09:23:01.949819+00:00] sql.INFO: [40.81] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-07-30T09:23:02.025031+00:00] sql.INFO: [3.51] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-07-30T09:23:03.028286+00:00] sql.INFO: [3.06] select * from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') order by `sort` asc limit 10 offset 0 [] []
+[2024-07-30T09:23:03.043636+00:00] sql.INFO: [2.83] select count(*) as aggregate from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') [] []
+[2024-07-30T09:23:04.600039+00:00] sql.INFO: [1.96] select * from `category` where (`website_id` = '0') [] []
+[2024-07-30T09:23:25.498472+00:00] sql.INFO: [11.71] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-07-30T09:23:25.527648+00:00] sql.INFO: [4.7] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-07-30T09:23:49.026318+00:00] sql.INFO: [4.02] select * from `category` where (`website_id` = '0') [] []
+[2024-07-30T09:24:48.960056+00:00] sql.INFO: [5.3] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-07-30T09:24:49.008782+00:00] sql.INFO: [11.63] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-07-30T09:44:43.079028+00:00] sql.INFO: [34.88] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-07-30T09:44:43.104460+00:00] sql.INFO: [4.99] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-07-30T09:44:46.082357+00:00] sql.INFO: [8.99] select * from `category` where (`website_id` = '0') [] []
+[2024-08-12T03:22:13.641419+00:00] sql.INFO: [37.31] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-08-12T03:22:13.662253+00:00] sql.INFO: [1.8] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-08-12T03:22:47.546048+00:00] sql.INFO: [2.5] select * from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') order by `sort` asc limit 10 offset 0 [] []
+[2024-08-12T03:22:47.551817+00:00] sql.INFO: [2.09] select count(*) as aggregate from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') [] []
+[2024-08-12T06:58:50.715222+00:00] sql.INFO: [88.23] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-08-12T06:58:50.733373+00:00] sql.INFO: [2.99] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-08-12T06:58:51.706425+00:00] sql.INFO: [1.62] select * from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') order by `sort` asc limit 10 offset 0 [] []
+[2024-08-12T06:58:51.714618+00:00] sql.INFO: [2.14] select count(*) as aggregate from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') [] []
+[2024-08-12T06:58:55.412950+00:00] sql.INFO: [2.89] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-08-12T06:58:55.426285+00:00] sql.INFO: [2.04] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-08-12T06:59:09.432663+00:00] sql.INFO: [2.5] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-08-12T06:59:09.443746+00:00] sql.INFO: [1.95] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-08-12T07:37:38.541842+00:00] sql.INFO: [15.53] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-08-12T07:37:38.562857+00:00] sql.INFO: [1.92] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-08-12T09:51:34.958501+00:00] sql.INFO: [23.5] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-08-12T09:51:34.993812+00:00] sql.INFO: [2.83] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-08-12T09:51:36.404151+00:00] sql.INFO: [2.88] select * from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') order by `sort` asc limit 10 offset 0 [] []
+[2024-08-12T09:51:36.414848+00:00] sql.INFO: [2.36] select count(*) as aggregate from `category` where (`name` like '%%' and `website_id` = '0' and `pid` = '0') [] []
+[2024-08-12T09:51:40.699932+00:00] sql.INFO: [2.89] select `article`.*, `category`.`name`, `article_data`.`content` from `article` left join `category` on `article`.`catid` = `category`.`id` left join `article_data` on `article`.`id` = `article_data`.`article_id` where (`article`.`title` like '%%' and `article`.`status` != '5') order by `article`.`id` desc limit 10 offset 0 [] []
+[2024-08-12T09:51:40.720188+00:00] sql.INFO: [3.44] select count(*) as aggregate from `article` where (`article`.`title` like '%%' and `article`.`status` != '5') [] []
+[2024-08-12T09:51:42.009719+00:00] sql.INFO: [2.34] select * from `category` where (`website_id` = '0') [] []
+>>>>>>> 50b6d9d (gitignore)