diff --git a/apps/bili-fetcher/README.md b/apps/bili-fetcher/README.md
new file mode 100644
index 000000000..5f10ca785
--- /dev/null
+++ b/apps/bili-fetcher/README.md
@@ -0,0 +1,43 @@
+# BiliFetcher
+
+B站历史记录
+
+![BiliFetcher](https://file.lifebus.top/imgs/bili_fetcher_cover.png)
+
+![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue)
+
+## 简介
+
+获取B站历史记录
+
+批量下载视频
+
+一键下载用户投稿视频
+
+收藏夹所有视频
+
+生成详细的年度总结
+
+自动化任务
+
+## 特性
+
+![BiliFetcher](https://file.lifebus.top/imgs/bili_fetcher_img1.png)
+
+![BiliFetcher](https://file.lifebus.top/imgs/bili_fetcher_img2.png)
+
+![BiliFetcher](https://file.lifebus.top/imgs/bili_fetcher_img3.png)
+
+![BiliFetcher](https://file.lifebus.top/imgs/bili_fetcher_img4.png)
+
+![BiliFetcher](https://file.lifebus.top/imgs/bili_fetcher_img5.png)
+
+![BiliFetcher](https://file.lifebus.top/imgs/bili_fetcher_img6.png)
+
+![BiliFetcher](https://file.lifebus.top/imgs/bili_fetcher_img7.png)
+
+![BiliFetcher](https://file.lifebus.top/imgs/bili_fetcher_img8.png)
+
+---
+
+![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png)
diff --git a/apps/bili-fetcher/data.yml b/apps/bili-fetcher/data.yml
new file mode 100644
index 000000000..6750233d1
--- /dev/null
+++ b/apps/bili-fetcher/data.yml
@@ -0,0 +1,14 @@
+additionalProperties:
+  key: bili-fetcher
+  name: BiliFetcher
+  tags:
+    - WebSite
+    - Local
+  shortDescZh: B站历史记录
+  shortDescEn: Bilibili History Fetcher
+  type: website
+  crossVersionUpdate: true
+  limit: 0
+  website: https://github.com/2977094657/BilibiliHistoryFetcher/
+  github: https://github.com/2977094657/BilibiliHistoryFetcher/
+  document: https://github.com/2977094657/BilibiliHistoryFetcher/
diff --git a/apps/bili-fetcher/latest/data.yml b/apps/bili-fetcher/latest/data.yml
new file mode 100644
index 000000000..3233ebf07
--- /dev/null
+++ b/apps/bili-fetcher/latest/data.yml
@@ -0,0 +1,17 @@
+additionalProperties:
+  formFields:
+    - default: "/home/bili-fetcher"
+      edit: true
+      envKey: BILI_FETCHER_ROOT_PATH
+      labelZh: 数据持久化路径
+      labelEn: Data persistence path
+      required: true
+      type: text
+    - default: 8080
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelZh: WebUI 端口
+      labelEn: WebUI port
+      required: true
+      rule: paramPort
+      type: number
diff --git a/apps/bili-fetcher/latest/docker-compose.yml b/apps/bili-fetcher/latest/docker-compose.yml
new file mode 100644
index 000000000..fa0270bd8
--- /dev/null
+++ b/apps/bili-fetcher/latest/docker-compose.yml
@@ -0,0 +1,42 @@
+networks:
+  1panel-network:
+    external: true
+
+services:
+  bili-fetcher-api:
+    image: bilibili-api:latest
+    build:
+      context: https://github.com/2977094657/BilibiliHistoryFetcher.git
+      dockerfile: docker/Dockerfile.cpu
+    container_name: api-${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    env_file:
+      - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
+      - ${ENV_FILE:-/etc/1panel/envs/default.env}
+    volumes:
+      - ${BILI_FETCHER_ROOT_PATH}/config:/app/config
+      - ${BILI_FETCHER_ROOT_PATH}/output:/app/output
+    environment:
+      - TZ=Asia/Shanghai
+      - DOCKER_ENV=true
+
+  bili-fetcher-web:
+    image: bilibili-frontend:latest
+    build:
+      context: https://github.com/2977094657/BiliHistoryFrontend.git
+      dockerfile: Dockerfile
+    depends_on:
+      - bili-fetcher-api
+    container_name: ${CONTAINER_NAME}
+    labels:
+      createdBy: "Apps"
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:80
+    environment:
+      - BACKEND_URL=http://bili-fetcher-api:8899
+      - TZ=Asia/Shanghai
diff --git a/apps/bili-fetcher/latest/envs/default.env b/apps/bili-fetcher/latest/envs/default.env
new file mode 100644
index 000000000..cd05f46e6
--- /dev/null
+++ b/apps/bili-fetcher/latest/envs/default.env
@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+ENV_FILE=.env
diff --git a/apps/bili-fetcher/latest/envs/global.env b/apps/bili-fetcher/latest/envs/global.env
new file mode 100644
index 000000000..e10989fe4
--- /dev/null
+++ b/apps/bili-fetcher/latest/envs/global.env
@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+TZ=Asia/Shanghai
diff --git a/apps/bili-fetcher/latest/scripts/init.sh b/apps/bili-fetcher/latest/scripts/init.sh
new file mode 100644
index 000000000..07fb8c3fe
--- /dev/null
+++ b/apps/bili-fetcher/latest/scripts/init.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  sed -i '/^GLOBAL_ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/apps/bili-fetcher/latest/scripts/uninstall.sh b/apps/bili-fetcher/latest/scripts/uninstall.sh
new file mode 100644
index 000000000..c86c4fbca
--- /dev/null
+++ b/apps/bili-fetcher/latest/scripts/uninstall.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/apps/bili-fetcher/latest/scripts/upgrade.sh b/apps/bili-fetcher/latest/scripts/upgrade.sh
new file mode 100644
index 000000000..07fb8c3fe
--- /dev/null
+++ b/apps/bili-fetcher/latest/scripts/upgrade.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  sed -i '/^GLOBAL_ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/apps/bili-fetcher/logo.png b/apps/bili-fetcher/logo.png
new file mode 100644
index 000000000..3e2301c30
Binary files /dev/null and b/apps/bili-fetcher/logo.png differ