diff --git a/cpn-tianji/docker-compose.yml b/cpn-tianji/docker-compose.yml
new file mode 100644
index 0000000..b6883a6
--- /dev/null
+++ b/cpn-tianji/docker-compose.yml
@@ -0,0 +1,43 @@
+version: "3.7"
+
+name: cpn-tianji
+services:
+  cpn-tianji:
+    container_name: cpn-tianji
+    image: moonrailgun/tianji:1.31.8@sha256:86b58556fa9ff5454cb4eeddc2330124244733820a56b5491c8c0e4399880c68
+    restart: unless-stopped
+    environment:
+      DATABASE_URL: postgresql://tianji-user:227453b7-1286-48cc-b471-1c269495c5fc@cpn-tianji-db:5432/tianji
+      JWT_SECRET: replace-me-with-a-random-string
+      ALLOW_REGISTER: "false"
+      ALLOW_OPENAPI: "true"
+    ports:
+      - "12345:12345"
+    networks:
+      - cpn_tianji_network
+    depends_on:
+      - cpn-tianji-db
+  cpn-tianji-db:
+    container_name: cpn-tianji-db
+    image: postgres:15.4-alpine
+    environment:
+      POSTGRES_DB: tianji
+      POSTGRES_USER: tianji-user
+      POSTGRES_PASSWORD: 227453b7-1286-48cc-b471-1c269495c5fc
+    volumes:
+      - tianji_pgdata:/var/lib/postgresql/data
+    restart: always
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    networks:
+      - cpn_tianji_network
+networks:
+  cpn_tianji_network:
+    driver: bridge
+volumes:
+  tianji_pgdata:
+    name: tianji_pgdata
+    driver: local
\ No newline at end of file
diff --git a/cpn-tianji/umbrel-app.yml b/cpn-tianji/umbrel-app.yml
new file mode 100644
index 0000000..7756068
--- /dev/null
+++ b/cpn-tianji/umbrel-app.yml
@@ -0,0 +1,54 @@
+manifestVersion: 1
+id: cpn-tianji
+name: Tianji
+tagline: Insight into everything, Website Analytics + Uptime Monitor + Server Status
+icon: https://git.weektab.org/companas/umbrel-apps/raw/branch/main/gallery/tianji/icon.png
+category: Networking
+version: "1.31.8"
+port: 12345
+description: >-
+  During our observations of the website. We often need to use multiple applications together. 
+  For example, we need analysis tools such as GA/umami to check pv/uv and the number of visits 
+  to each page, we need an uptime monitor to check the network quality and connectivity of the 
+  server, and we need to use prometheus to obtain the status reported by the server to check 
+  the quality of the server.
+
+
+  In addition, if we develop an application that allows open source deployment, we often need 
+  a telemetry system to help us collect the simplest information about other people's deployment 
+  situations.
+
+
+  I think these tools should serve the same purpose, so is there an application that can integrate 
+  these common needs in a lightweight way? After all, most of the time we don't need very professional 
+  and in-depth functions. But in order to achieve comprehensive monitoring, I need to install so many 
+  services.
+
+
+  It's good to specialize in one thing, if we are experts in related abilities we need such specialized 
+  tools. But for most users who only have lightweight needs, an All-in-One application will be more 
+  convenient and easier to use.
+developer: Msgbyte
+website: https://tianji.dev/
+submitter: Weektab
+submission: https://git.weektab.org/companas/umbrel-apps
+repo: https://git.weektab.org/companas/umbrel-apps/src/branch/main/cpn-tianji
+support: https://git.weektab.org/companas/umbrel-apps/issues
+gallery:
+  - https://git.weektab.org/companas/umbrel-apps/raw/branch/main/gallery/tianji/image-1.jpeg
+  - https://git.weektab.org/companas/umbrel-apps/raw/branch/main/gallery/tianji/image-2.jpeg
+  - https://git.weektab.org/companas/umbrel-apps/raw/branch/main/gallery/tianji/image-3.jpeg
+  - https://git.weektab.org/companas/umbrel-apps/raw/branch/main/gallery/tianji/image-4.jpeg
+  - https://git.weektab.org/companas/umbrel-apps/raw/branch/main/gallery/tianji/image-5.jpeg
+releaseNotes: >
+    Features: 
+      - add url as new field type of survey (c8a6efe)
+      - add wrap for survey event table to display long text (1ea8d41)
+
+    Others:
+      - update model price (f7daffa)
+      - update translation (21d929a)
+dependencies: []
+path: ""
+defaultUsername: "admin"  
+defaultPassword: "admin"
\ No newline at end of file
diff --git a/gallery/tianji/icon.png b/gallery/tianji/icon.png
new file mode 100644
index 0000000..81cd02d
Binary files /dev/null and b/gallery/tianji/icon.png differ
diff --git a/gallery/tianji/image-1.jpeg b/gallery/tianji/image-1.jpeg
new file mode 100644
index 0000000..592e775
Binary files /dev/null and b/gallery/tianji/image-1.jpeg differ
diff --git a/gallery/tianji/image-2.jpeg b/gallery/tianji/image-2.jpeg
new file mode 100644
index 0000000..00a68a4
Binary files /dev/null and b/gallery/tianji/image-2.jpeg differ
diff --git a/gallery/tianji/image-3.jpeg b/gallery/tianji/image-3.jpeg
new file mode 100644
index 0000000..de91eeb
Binary files /dev/null and b/gallery/tianji/image-3.jpeg differ
diff --git a/gallery/tianji/image-4.jpeg b/gallery/tianji/image-4.jpeg
new file mode 100644
index 0000000..9aeb347
Binary files /dev/null and b/gallery/tianji/image-4.jpeg differ
diff --git a/gallery/tianji/image-5.jpeg b/gallery/tianji/image-5.jpeg
new file mode 100644
index 0000000..614a895
Binary files /dev/null and b/gallery/tianji/image-5.jpeg differ