diff --git a/dvwa/README.md b/dvwa/README.md
index b2894a877..552d98cc1 100644
--- a/dvwa/README.md
+++ b/dvwa/README.md
@@ -2,14 +2,14 @@
 
 ## 默认账户密码
 
-用户名：`admin`
+```
+username：admin
+password：password
+```
 
-密码：`password`
+## 中文名："该死的" 不安全的Web应用程序
 
-
-## 中文名："该死的"不安全的Web应用程序
-
-DVWA是一个编码差的、易受攻击的 PHP/MySQL Web应用程序。
+**DVWA** 是一个编码差的、易受攻击的 PHP/MySQL Web 应用程序。
 
 ### 目的
 - 帮助信息安全专业人员在合法的环境中，练习技能和测试工具
diff --git a/dvwa/data.yml b/dvwa/data.yml
index 6d3975604..29ba7d388 100644
--- a/dvwa/data.yml
+++ b/dvwa/data.yml
@@ -2,18 +2,18 @@ name: DVWA
 tags:
     - 安全
 title: DVWA
-description: 一个用来进行安全脆弱性鉴定的PHP/MySQL Web 应用平台。
+description: 一个用来进行安全脆弱性鉴定的 PHP/MySQL Web 应用平台。
 additionalProperties:
     key: dvwa
     name: DVWA
     tags:
         - Security
-    shortDescZh: 一个用来进行安全脆弱性鉴定的PHP/MySQL Web 应用平台。
+    shortDescZh: 一个用来进行安全脆弱性鉴定的 PHP/MySQL Web 应用平台。
     shortDescEn: DVWA (Damn Vulnerable Web Application)
-    type: security
+    type: tool
     crossVersionUpdate: true
     limit: 0
-    recommend: 10
+    recommend: 0
     website: https://github.com/digininja/DVWA
     github: https://github.com/digininja/DVWA
     document: https://github.com/digininja/DVWA
diff --git a/dvwa/latest/data.yml b/dvwa/latest/data.yml
index fd3015314..29c0511d9 100644
--- a/dvwa/latest/data.yml
+++ b/dvwa/latest/data.yml
@@ -1,89 +1,92 @@
 additionalProperties:
-    formFields:
-        - child:
-            default: ""
-            envKey: PANEL_DB_HOST
-            required: true
-            type: service
-          default: mariadb
-          envKey: PANEL_DB_TYPE
-          labelEn: Database Service
-          labelZh: 数据库服务
-          required: true
-          type: apps
-          values:
-            - label: MariaDB
-              value: mariadb
-            - label: MySQL
-              value: mysql
-        - default: dvwa
-          envKey: PANEL_DB_NAME
-          labelEn: Database
-          labelZh: 数据库名
-          required: true
-          rule: paramCommon
-          type: text
-        - default: dvwa
-          envKey: PANEL_DB_USER
-          labelEn: User
-          labelZh: 数据库用户
-          required: true
-          rule: paramCommon
-          type: text
-        - default: p@ssw0rd
-          envKey: PANEL_DB_USER_PASSWORD
-          labelEn: Password
-          labelZh: 数据库用户密码
-          required: true
-          rule: paramComplexity
-          type: password
-        - default: "low"
-          envKey: DVWA_SECURITY_LEVEL
-          labelEn: Security level
-          labelZh: 安全级别
-          required: true
-          type: select
-          values:
-            - label: 低
-              value: "low"
-            - label: 中
-              value: "medium"
-            - label: 高
-              value: "high"
-            - label: 极高
-              value: "impossible"
-        - default: "zh"
-          envKey: DVWA_DEFAULT_LOCALE
-          labelEn: Locale
-          labelZh: 语言环境
-          required: true
-          type: select
-          values:
-            - label: 中文
-              value: "zh"
-            - label: 英文
-              value: "en"
-        - default: ""
-          edit: true
-          envKey: DVWA_RECAPTCHA_PUBLIC_KEY
-          labelEn: Recaptcha Public Key
-          labelZh: 验证码公钥
-          required: false
-          rule: paramCommon
-          type: text
-        - default: ""
-          edit: true
-          envKey: DVWA_RECAPTCHA_PRIVATE_KEY
-          labelEn: Recaptcha Private Key
-          labelZh: 验证码私钥
-          required: false
-          rule: paramCommon
-          type: text
-        - default: "4280"
-          edit: true
-          envKey: PANEL_APP_PORT_HTTP
-          labelEn: Port
-          labelZh: 端口
-          required: true
-          rule: paramPort
-          type: number
+  formFields:
+    - child:
+        default: ""
+        envKey: PANEL_DB_HOST
+        required: true
+        type: service
+      default: mysql
+      envKey: PANEL_DB_TYPE
+      labelEn: Database Service
+      labelZh: 数据库服务
+      required: true
+      type: apps
+      values:
+        - label: MySQL
+          value: mysql
+        - label: MariaDB
+          value: mariadb
+    - default: dvwa
+      envKey: PANEL_DB_NAME
+      labelEn: Database
+      labelZh: 数据库名
+      random: true
+      required: true
+      rule: paramCommon
+      type: text
+    - default: dvwa
+      envKey: PANEL_DB_USER
+      labelEn: User
+      labelZh: 数据库用户
+      random: true
+      required: true
+      rule: paramCommon
+      type: text
+    - default: dvwa
+      envKey: PANEL_DB_USER_PASSWORD
+      labelEn: Password
+      labelZh: 数据库用户密码
+      random: true
+      required: true
+      rule: paramComplexity
+      type: password
+    - default: "low"
+      envKey: DVWA_SECURITY_LEVEL
+      labelEn: Security level
+      labelZh: 安全级别
+      required: true
+      type: select
+      values:
+        - label: 低
+          value: "low"
+        - label: 中
+          value: "medium"
+        - label: 高
+          value: "high"
+        - label: 极高
+          value: "impossible"
+    - default: "zh"
+      envKey: DVWA_DEFAULT_LOCALE
+      labelEn: Locale
+      labelZh: 语言环境
+      required: true
+      type: select
+      values:
+        - label: 中文
+          value: "zh"
+        - label: 英文
+          value: "en"
+    - default: ""
+      edit: true
+      envKey: DVWA_RECAPTCHA_PUBLIC_KEY
+      labelEn: Recaptcha Public Key
+      labelZh: 验证码公钥
+      required: false
+      rule: paramCommon
+      type: text
+    - default: ""
+      edit: true
+      envKey: DVWA_RECAPTCHA_PRIVATE_KEY
+      labelEn: Recaptcha Private Key
+      labelZh: 验证码私钥
+      required: false
+      rule: paramCommon
+      type: text
+    - default: "4280"
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      required: true
+      rule: paramPort
+      type: number