diff --git a/timestamp-server/3.1.0-jvm/data.yml b/timestamp-server/3.1.0-jvm/data.yml
new file mode 100644
index 000000000..ea29418bd
--- /dev/null
+++ b/timestamp-server/3.1.0-jvm/data.yml
@@ -0,0 +1,16 @@
+additionalProperties:
+  formFields:
+    - default: 43718
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: service Port
+      labelZh: 服务端口
+      required: true
+      type: number
+    - default: ""
+      edit: true
+      envKey: P12_PASSWORD
+      labelEn: Pfx Cert Password
+      labelZh: Pfx证书密码(无密码不填)
+      required: false
+      type: text
diff --git a/timestamp-server/3.1.0-jvm/docker-compose.yml b/timestamp-server/3.1.0-jvm/docker-compose.yml
new file mode 100644
index 000000000..cc650b7da
--- /dev/null
+++ b/timestamp-server/3.1.0-jvm/docker-compose.yml
@@ -0,0 +1,19 @@
+services:
+  timestamp-server:
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:8080"
+    volumes:
+      - "./data:/work/data"
+    environment:
+      - "tsa.keystore.password=${P12_PASSWORD}"
+      - "tsa.keystore.path=/work/data/tsa.pfx"
+    image: dnl50/tsa-server:3.3.0-jvm
+    labels:  
+      createdBy: "Apps"
+networks:  
+  1panel-network:  
+    external: true
diff --git a/timestamp-server/README.md b/timestamp-server/README.md
new file mode 100644
index 000000000..670f6f25b
--- /dev/null
+++ b/timestamp-server/README.md
@@ -0,0 +1,17 @@
+# timestamp_server
+
+此应用是一个简单的时间戳服务器，用于返回RFC3161协议时间戳。
+
+时间戳服务地址为http://[IP]:[PORT]/sign
+
+签名历史记录地址为http://[IP]:[PORT]/history/responses
+
+## 注意事项(重要!!!)
+
+证书格式必须为PKCS#12(.pfx),证书需重命名为tsa.pfx,并放在应用安装目录下
+
+应用数据目录权限需要改为0777(勾选同时修改子文件属性)
+
+证书必须是时间戳终端证书,必须包含critical(关键拓展)
+
+完成后重启容器或等待容器自动重启即可
\ No newline at end of file
diff --git a/timestamp-server/data.yml b/timestamp-server/data.yml
new file mode 100644
index 000000000..8562ffdba
--- /dev/null
+++ b/timestamp-server/data.yml
@@ -0,0 +1,13 @@
+additionalProperties:
+  crossVersionUpdate: true
+  document: https://github.com/dnl50/tsa
+  github: https://github.com/dnl50/tsa
+  key: timestamp-server
+  limit: 0
+  name: timestamp-server
+  shortDescEn: timestamp-server
+  shortDescZh: 时间戳服务器
+  tags:
+  - Tool
+  type: runtime
+  website: https://github.com/dnl50/tsa
diff --git a/timestamp-server/logo.png b/timestamp-server/logo.png
new file mode 100644
index 000000000..7716d8488
Binary files /dev/null and b/timestamp-server/logo.png differ