diff --git a/all.json b/all.json index 60ab435..4380d3a 100644 --- a/all.json +++ b/all.json @@ -1,6 +1,7 @@ { "statistical_data": { "friends_num": 81, +<<<<<<< HEAD "active_num": 72, "error_num": 9, "article_num": 329, @@ -15,6 +16,15 @@ "avatar": "https://cdn.qyliu.top/i/2024/06/01/665a9a8f8418a.png" }, { +======= + "active_num": 64, + "error_num": 17, + "article_num": 286, + "last_updated_time": "2024-07-28 20:37:23" + }, + "article_data": [ + { +>>>>>>> 723ca28a1227436b20dc7a21a0186bd9381a2ac7 "title": "所有文章", "created": "2024-07-28 20:28", "link": "https://blog.hesiy.cn/posts/", @@ -1372,13 +1382,6 @@ "author": "幻雪博客", "avatar": "https://cdn.qyliu.top/i/2024/03/31/66090bfe06ba6.png" }, - { - "title": "5月上旬", - "created": "2024-05-12 22:01", - "link": "https://flytusky.top/archives/141/", - "author": "微笔记", - "avatar": "https://cdn.qyliu.top/i/2024/04/06/66117022b57a5.png" - }, { "title": "5月12日 随笔", "created": "2024-05-12 04:14", @@ -1541,6 +1544,7 @@ "avatar": "https://cdn.qyliu.top/i/2024/04/06/661170950f7a2.png" }, { +<<<<<<< HEAD "title": "添加那年今日卡片", "created": "2024-04-24 09:40", "link": "https://blog.qjqq.cn/posts/155e.html", @@ -1555,19 +1559,14 @@ "avatar": "https://cdn.qyliu.top/i/2024/04/06/66117022b57a5.png" }, { +======= +>>>>>>> 723ca28a1227436b20dc7a21a0186bd9381a2ac7 "title": "一文让你理解网络阻塞与非阻塞和多路io复用", "created": "2024-04-21 17:55", "link": "https://huanxueblog.top/posts/a8fad53.html", "author": "幻雪博客", "avatar": "https://cdn.qyliu.top/i/2024/03/31/66090bfe06ba6.png" }, - { - "title": "万有引力定律与航空航天", - "created": "2024-04-21 06:16", - "link": "https://flytusky.top/archives/135/", - "author": "微笔记", - "avatar": "https://cdn.qyliu.top/i/2024/04/06/66117022b57a5.png" - }, { "title": "探秘米哈游技术进步：《绝区零》三测体验", "created": "2024-04-20 21:07", @@ -1764,20 +1763,6 @@ "author": "东评西就", "avatar": "https://cdn.qyliu.top/i/2024/04/09/6614f26979229.png" }, - { - "title": "推荐一下维他命图床", - "created": "2024-04-06 01:14", - "link": "https://flytusky.top/archives/132/", - "author": "微笔记", - "avatar": "https://cdn.qyliu.top/i/2024/04/06/66117022b57a5.png" - }, - { - "title": "月考一的思考与感悟", - "created": "2024-04-05 18:12", - "link": "https://flytusky.top/archives/131/", - "author": "微笔记", - "avatar": "https://cdn.qyliu.top/i/2024/04/06/66117022b57a5.png" - }, { "title": "免费安装杜比全景声", "created": "2024-04-03 11:09", @@ -2204,6 +2189,16 @@ "link": "https://blog.hesiy.cn/about/", "author": "FloatSheep", "avatar": "https://cdn.qyliu.top/i/2024/07/28/66a6324891ba1.webp" +<<<<<<< HEAD +======= + }, + { + "title": "那些年用过的CSS奇妙用法之能用CSS就不用JS技巧系列", + "created": "2023-08-27 19:22", + "link": "https://blog.anheyu.com/posts/340b.html", + "author": "安知鱼", + "avatar": "https://cdn.qyliu.top/i/2024/04/06/66117080f2460.png" +>>>>>>> 723ca28a1227436b20dc7a21a0186bd9381a2ac7 }, { "title": "友链", @@ -2213,11 +2208,38 @@ "avatar": "https://cdn.qyliu.top/i/2024/07/28/66a6324891ba1.webp" }, { +<<<<<<< HEAD +======= + "title": "友链", + "created": "2023-08-24 04:49", + "link": "https://blog.hesiy.cn/friends/", + "author": "FloatSheep", + "avatar": "https://cdn.qyliu.top/i/2024/07/28/66a6324891ba1.webp" + }, + { +>>>>>>> 723ca28a1227436b20dc7a21a0186bd9381a2ac7 "title": "友链集装箱", "created": "2023-08-24 04:49", "link": "https://blog.hesiy.cn/container/", "author": "FloatSheep", "avatar": "https://cdn.qyliu.top/i/2024/07/28/66a6324891ba1.webp" +<<<<<<< HEAD +======= + }, + { + "title": "腾讯出品免费logo制作神器AI Logo,腾讯这次真的良心了", + "created": "2023-08-19 18:42", + "link": "https://blog.anheyu.com/posts/8105.html", + "author": "安知鱼", + "avatar": "https://cdn.qyliu.top/i/2024/04/06/66117080f2460.png" + }, + { + "title": "当AI加上PS后让我变的极为振奋(附mac安装ps beta25.0)教程", + "created": "2023-08-18 19:24", + "link": "https://blog.anheyu.com/posts/4eb4.html", + "author": "安知鱼", + "avatar": "https://cdn.qyliu.top/i/2024/04/06/66117080f2460.png" +>>>>>>> 723ca28a1227436b20dc7a21a0186bd9381a2ac7 }, { "title": "Swpp Backends 官方文档", diff --git a/errors.json b/errors.json index e221d30..4d2a081 100644 --- a/errors.json +++ b/errors.json @@ -1,35 +1,103 @@ [ [ +<<<<<<< HEAD +======= + "Tianli", + "https://tianli-blog.club/", + "https://cdn.qyliu.top/i/2024/04/06/66116950412cc.png" + ], + [ + "星の野", + "https://byer.top/", + "https://bu.dusays.com/2023/10/01/6519291503349.jpg" + ], + [ + "阮一峰", + "https://www.ruanyifeng.com/blog/", + "https://cdn.qyliu.top/i/2024/04/29/662fbca75b9fe.png" + ], + [ + "青桔气球", + "https://blog.qjqq.cn/", + "https://cdn.qyliu.top/i/2024/04/07/661241402f02a.png" + ], + [ +>>>>>>> 723ca28a1227436b20dc7a21a0186bd9381a2ac7 "Redish", "https://blog.redish101.top/", "https://cdn.qyliu.top/i/2024/04/07/6612417f11b02.png" ], [ +<<<<<<< HEAD "GuKaifeng", "https://gukaifeng.cn/", "https://cdn.qyliu.top/i/2024/04/09/6614ef03406cc.png" ], [ +======= +>>>>>>> 723ca28a1227436b20dc7a21a0186bd9381a2ac7 "Rootlex", "https://blog.nalex.top", "https://q2.qlogo.cn/headimg_dl?dst_uin=1736191951&spec=640" ], [ - "听风小屋", - "https://blog.ifeng.asia/", - "https://cdn.qyliu.top/i/2024/03/31/6608e2697634c.png" +<<<<<<< HEAD +======= + "Android", + "https://android99.com", + "https://cdn.qyliu.top/i/2024/04/07/66124120884cc.png" + ], + [ + "皮普", + "https://pipuwong.com", + "https://cdn.qyliu.top/i/2024/04/09/6614f1b29c34a.png" ], [ "理随", "https://lisui.top/", "https://cdn.qyliu.top/i/2024/04/07/66123e6aac11c.png" ], + [ +>>>>>>> 723ca28a1227436b20dc7a21a0186bd9381a2ac7 + "听风小屋", + "https://blog.ifeng.asia/", + "https://cdn.qyliu.top/i/2024/03/31/6608e2697634c.png" + ], + [ +<<<<<<< HEAD + "理随", + "https://lisui.top/", + "https://cdn.qyliu.top/i/2024/04/07/66123e6aac11c.png" +======= + "GuKaifeng", + "https://gukaifeng.cn/", + "https://cdn.qyliu.top/i/2024/04/09/6614ef03406cc.png" +>>>>>>> 723ca28a1227436b20dc7a21a0186bd9381a2ac7 + ], [ "茗辰原", "https://mingcy.xyz/", "https://cdn.qyliu.top/i/2024/04/21/66249e0a775f8.png" ], [ +<<<<<<< HEAD +======= + "微生之最", + "https://www.bbixb.top/", + "https://cdn.qyliu.top/i/2024/05/04/66351f5b62b65.png" + ], + [ + "往日信笺", + "https://www.xingmail.cn/", + "https://cdn.qyliu.top/i/2024/04/14/661bf476a6d8d.png" + ], + [ + "轻笑", + "https://www.qcqx.cn/", + "https://cdn.qyliu.top/i/2024/05/31/6659628eddf20.png" + ], + [ +>>>>>>> 723ca28a1227436b20dc7a21a0186bd9381a2ac7 "Dreamaker", "https://dreamakerr.cn/", "https://cdn.qyliu.top/i/2024/06/05/66604a6f8dba9.webp"