diff --git a/apps/dashmachine/README.md b/apps/dashmachine/README.md
new file mode 100644
index 00000000..3a5e9161
--- /dev/null
+++ b/apps/dashmachine/README.md
@@ -0,0 +1,55 @@
+# DashMachine
+
+## 默认账号密码
+```
+User: admin
+Password: admin
+```
+
+## 安装
+
+### Docker
+```
+docker create \
+  --name=dashmachine \
+  -p 5000:5000 \
+  -v path/to/data:/dashmachine/dashmachine/user_data \
+  --restart unless-stopped \
+  rmountjoy/dashmachine:latest
+```
+To run in a subfolder, use a CONTEXT_PATH environment variable. For example, to run at localhost:5000/dash:
+```
+docker create \
+  --name=dashmachine \
+  -p 5000:5000 \
+  -e CONTEXT_PATH=/dash
+  -v path/to/data:/dashmachine/dashmachine/user_data \
+  --restart unless-stopped \
+  rmountjoy/dashmachine:latest
+```
+### Synology
+Check out this awesome guide: https://nashosted.com/manage-your-self-hosted-applications-using-dashmachine/
+### Python
+Instructions are for linux.
+```
+virtualenv --python=python3 DashMachineEnv
+cd DashMachineEnv && source bin/activate
+git clone https://github.com/rmountjoy92/DashMachine.git
+cd DashMachine && pip install -r requirements.txt
+python3 run.py
+```
+Then open a web browser and go to localhost:5000
+
+## FAQs
+1. application does not work in iframe
+see https://github.com/rmountjoy92/DashMachine/issues/6
+
+## 演示
+
+![screenshot](https://raw.githubusercontent.com/rmountjoy92/DashMachine/master/screenshot1.png)
+
+![screenshot](https://raw.githubusercontent.com/rmountjoy92/DashMachine/master/screenshot2.png)
+
+![screenshot](https://raw.githubusercontent.com/rmountjoy92/DashMachine/master/screenshot3.png)
+
+![screenshot](https://raw.githubusercontent.com/rmountjoy92/DashMachine/master/screenshot4.png)
diff --git a/apps/dashmachine/data.yml b/apps/dashmachine/data.yml
new file mode 100644
index 00000000..87ae3d33
--- /dev/null
+++ b/apps/dashmachine/data.yml
@@ -0,0 +1,20 @@
+name: DashMachine
+tags:
+    - 工具
+title: 一个具有有趣功能的 Web 应用程序书签仪表板
+type: 工具
+description: 一个具有有趣功能的 Web 应用程序书签仪表板
+additionalProperties:
+    key: dashmachine
+    name: DashMachine
+    tags:
+        - Tool
+    shortDescZh: 一个具有有趣功能的 Web 应用程序书签仪表板
+    shortDescEn: A web application bookmark dashboard, with fun features
+    type: tool
+    crossVersionUpdate: true
+    limit: 0
+    recommend: 0
+    website: https://github.com/rmountjoy92/DashMachine
+    github: https://github.com/rmountjoy92/DashMachine
+    document: https://github.com/rmountjoy92/DashMachine
diff --git a/apps/dashmachine/latest/.env.sample b/apps/dashmachine/latest/.env.sample
new file mode 100644
index 00000000..b6e87966
--- /dev/null
+++ b/apps/dashmachine/latest/.env.sample
@@ -0,0 +1,3 @@
+CONTAINER_NAME="dashmachine"
+PANEL_APP_PORT_HTTP="40144"
+DATA_PATH="./data"
diff --git a/apps/dashmachine/latest/data.yml b/apps/dashmachine/latest/data.yml
new file mode 100644
index 00000000..fe298135
--- /dev/null
+++ b/apps/dashmachine/latest/data.yml
@@ -0,0 +1,17 @@
+additionalProperties:
+    formFields:
+        - default: 40144
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP
+          labelEn: Port
+          labelZh: 端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: ./data
+          edit: true
+          envKey: DATA_PATH
+          labelEn: Data folder path
+          labelZh: 数据文件夹路径
+          required: true
+          type: text
diff --git a/apps/dashmachine/latest/docker-compose.yml b/apps/dashmachine/latest/docker-compose.yml
new file mode 100644
index 00000000..9624765d
--- /dev/null
+++ b/apps/dashmachine/latest/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '3'
+services:
+  dashmachine:
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:5000"
+    volumes:
+      - "${DATA_PATH}:/dashmachine/dashmachine/user_data"
+    image: rmountjoy/dashmachine:latest
+    labels:  
+      createdBy: "Apps"
+
+networks:  
+  1panel-network:  
+    external: true
diff --git a/apps/dashmachine/logo.png b/apps/dashmachine/logo.png
new file mode 100644
index 00000000..d0456de6
Binary files /dev/null and b/apps/dashmachine/logo.png differ