[pull] main from ProbiusOfficial:main

.github/workflows/ghdeploy.yml

@@ -1,11 +1,13 @@
-name: Deploy to Github Pages and Automatically update
+name: Deploy to GitHub Pages and Automatically update
 on:
   push:
     branches:
       - master
       - main
   schedule:
-    - cron: "0 0/2 * * *"
+    - cron: "0 */6 * * *"
+  repository_dispatch:
+    types: [Hello-CTFTime]
 
 permissions:
   contents: write
@@ -23,8 +25,10 @@ jobs:
         with:
           python-version: 3.9
 
-      - name: Install libxml2 and libxslt
-        run: sudo apt-get install -y libxml2-dev libxslt-dev
+      - name: Install libxml2-dev and libxslt-dev
+        run: |
+              sudo apt-get update
+              sudo apt-get install -y libxml2-dev libxslt-dev --fix-missing
 
       - name: Install dependencies
         run: pip install -r requirements.txt
@@ -38,7 +42,7 @@ jobs:
       - name: Check for changes
         id: check_changes
         run: |
-          git add docs/AR/friends.md
+          git add docs/hc-archive/friends.md
           if [ -n "$(git status --porcelain)" ]; then
             echo "CHANGES=true" >> $GITHUB_ENV
           fi

.gitignore

@@ -2,4 +2,10 @@ site
 .vscode
 doc
 .DS_Store
-EX
+EX
+docs/hc-reverse/change.py
+
+# pdm
+.pdm-python
+pdm.lock
+pyproject.toml

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "tabWidth": 4,
+  "semi": false
+}

Dockerfile

@@ -2,6 +2,7 @@ FROM python:3.9.0-alpine
 
 ENV PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple
 RUN pip install --upgrade pip
+RUN apk add --no-cache build-base
 
 WORKDIR /Hello-CTF
 COPY mkdocs.yml ./mkdocs.yml

README.md

@@ -3,7 +3,7 @@
      <div align="center">
     <img src="./images/struc.png">
     </div> 
-    <a href="http://ctf.probius.xyz/"> <img src="https://badgen.net/badge/Mkdocs/%E5%9C%A8%E7%BA%BF%E9%98%85%E8%AF%BB?icon=chrome&color=black"></a>
+    <a href="http://hello-ctf.com/"> <img src="https://badgen.net/badge/Mkdocs/%E5%9C%A8%E7%BA%BF%E9%98%85%E8%AF%BB?icon=chrome&color=black"></a>
     <a href="https://github.com/ProbiusOfficial/Hello-CTF"> <img src="https://badgen.net/github/stars/ProbiusOfficial/Hello-CTF?icon=github&color=black"></a>
     <a href="https://github.com/ProbiusOfficial/Hello-CTF"> <img src="https://badgen.net/github/forks/ProbiusOfficial/Hello-CTF?icon=github&color=black"></a>
     <a href="https://github.com/ProbiusOfficial/Hello-CTF/blob/main/LICENSE"> <img src="https://badgen.net/badge/license/GPLv3/"></a>
@@ -14,13 +14,13 @@
 
 
 
-文档依靠Mkdocs-material 基于Github-Page 依靠 gh-pages 部署在 [https://ctf.probius.xyz/](https://ctf.probius.xyz/)   
+文档依靠Mkdocs-material 基于GitHub Pages 依靠 gh-pages 部署在 [https://hello-ctf.com/](https://hello-ctf.com/)   
 
-因接入CDN，本站链接变更为：[https://ctf.probius.xyz/](https://ctf.probius.xyz/) ，感谢渊龙Sec安全团队[@AabyssZG](https://github.com/AabyssZG) 曾哥提供的CDN支持~
+因接入CDN，本站链接变更为：[https://hello-ctf.com/](https://hello-ctf.com/) ，感谢渊龙Sec安全团队[@AabyssZG](https://github.com/AabyssZG) 曾哥提供的CDN支持~
 
-您可以直接访问该页面[在线阅读](https://ctf.probius.xyz/)，如果您想要转载本项目，请带上项目源地址：https://github.com/ProbiusOfficial/Hello-CTF
+您可以直接访问该页面[在线阅读](https://hello-ctf.com/)，如果您想要转载本项目，请带上项目源地址：https://github.com/ProbiusOfficial/Hello-CTF
 
-如果文档有帮助到你，麻烦点一个:star:支持一下！！
+如果文档有帮助到你，麻烦点一个 :star: 支持一下！！
 
 ## 关于
 
@@ -35,7 +35,7 @@
 ## 加入我们
 
 本书仍然处于更新阶段，我们还有很多内容需要完善，欢迎您加入我们，一起完善本书，让更多的人了解CTF，参与CTF，享受CTF的乐趣。
-您随时可以通过提交 [「 Pr (PullRequest) 」](https://github.com/ProbiusOfficial/Hello-CTF/pulls)来协助我们完成本项目。
+您随时可以通过提交 [「 PR (Pull Request) 」](https://github.com/ProbiusOfficial/Hello-CTF/pulls)来协助我们完成本项目。
 
 - 如果您在阅读过程中发现任何 知识点错误，内容模糊，名词拼写错误等等的问题，还请您协助我们进行修改，您可以直接在评论区中提出，也可以直接提交PR。
 - 如果您有好的题目，好的题解，好的知识点讲解，或者其他合作意向，也欢迎您联系探姬([By QQ](2293808331))或者开启issue。

build.py

@@ -1,13 +1,15 @@
 import requests
+import urllib3
+from urllib3.exceptions import InsecureRequestWarning
+
+urllib3.disable_warnings(InsecureRequestWarning)
 
 def download_file(url):
-    """从URL下载文件并返回内容"""
     response = requests.get(url,verify=False)
     response.raise_for_status()
     return response.text
 
 def insert_content(original_file, start_marker, end_marker, new_content):
-    """在指定的开始和结束标记之间插入新内容"""
     with open(original_file, 'r', encoding='utf-8') as file:
         content = file.readlines()
 
@@ -30,23 +32,44 @@ def insert_content(original_file, start_marker, end_marker, new_content):
         file.writelines(content)
 
 def update_files():
-    """下载并更新文件"""
     # 更新 friends.md 和 index.md
     friends_content = download_file("https://raw.githubusercontent.com/ProbiusOfficial/helloCTF-CTFerlink/main/output/friends.md")
-    with open("docs/AR/friends.md", 'w', encoding='utf-8') as file:
+    print("downloaded friends.md")
+    with open("docs/hc-archive/friends.md", 'w', encoding='utf-8') as file:
         file.write(friends_content)
-    with open("docs/AR/index.md", 'w', encoding='utf-8') as file:
+    with open("docs/hc-archive/index.md", 'w', encoding='utf-8') as file:
         file.write(friends_content)
+    print("updated friends.md and index.md complete")
 
     # 更新 events 相关文件
     for filename in ["Now_running.md", "Past_events.md", "Upcoming_events.md"]:
         content = download_file(f"https://raw.githubusercontent.com/ProbiusOfficial/Hello-CTFtime/main/Out/{filename}")
-        with open(f"docs/ET/{filename}", 'w', encoding='utf-8') as file:
+        print(f"downloaded {filename}")
+        with open(f"docs/Event/{filename}", 'w', encoding='utf-8') as file:
             file.write(content)
+        print(f"updated events file-{filename} complete")
+
+
+    events_html_content = download_file("https://raw.githubusercontent.com/ProbiusOfficial/Hello-CTFtime/main/Out/index.md")
+    insert_content("docs/Event/index.md", "<!-- 赛事内容部分_开始 -->", "<!-- 赛事内容部分_结束 -->", events_html_content)
+    print("updated event-index.md complete")
+
+    # 更新 index.md
+    index_html_content = download_file("https://raw.githubusercontent.com/ProbiusOfficial/Hello-CTFtime/main/Out/home.md")
+    insert_content("docs/home/index.md", "<!-- 主页赛事展示_开始 -->", "<!-- 主页赛事展示_结束 -->", index_html_content)
+    print("updated home.md complete")
+
+    # update json
+
+    # 下载json文件到 docs\Event\json
+    CN_json_content = download_file("https://raw.githubusercontent.com/ProbiusOfficial/Hello-CTFtime/main/CN.json")
+    Global_json_content = download_file("https://raw.githubusercontent.com/ProbiusOfficial/Hello-CTFtime/main/Global.json")
+    print("downloaded json")
+    with open("docs/Event/json/CN.json", 'w', encoding='utf-8') as file:
+        file.write(CN_json_content)
+    with open("docs/Event/json/Global.json", 'w', encoding='utf-8') as file:
+        file.write(Global_json_content)
 
-    # 更新 events.html
-    events_html_content = download_file("https://raw.githubusercontent.com/ProbiusOfficial/Hello-CTFtime/main/Out/events.html")
-    insert_content("overrides/partials/events.html", "<!-- 赛事模块前置_开始 -->", "<!-- 赛事模块前置_结束 -->", events_html_content)
 
 if __name__ == "__main__":
     update_files()