diff --git a/collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java b/collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java
index e143781..9c67e51 100644
--- a/collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java
+++ b/collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java
@@ -52,8 +52,8 @@ public class JdbcCommonCollect extends AbstractCollect {
         }
         JdbcProtocol jdbcProtocol = metrics.getJdbc();
         String databaseUrl = constructDatabaseUrl(jdbcProtocol);
-        // 查询超时时间默认3000毫秒
-        int timeout = 3000;
+        // 查询超时时间默认6000毫秒
+        int timeout = 6000;
         try {
             // 获取查询语句超时时间
             if (jdbcProtocol.getTimeout() != null) {
diff --git a/collector/src/main/java/com/usthe/collector/collect/icmp/IcmpCollectImpl.java b/collector/src/main/java/com/usthe/collector/collect/icmp/IcmpCollectImpl.java
index 4c04985..e78abbf 100644
--- a/collector/src/main/java/com/usthe/collector/collect/icmp/IcmpCollectImpl.java
+++ b/collector/src/main/java/com/usthe/collector/collect/icmp/IcmpCollectImpl.java
@@ -37,8 +37,8 @@ public class IcmpCollectImpl extends AbstractCollect {
             return;
         }
         IcmpProtocol icmp = metrics.getIcmp();
-        // 超时时间默认300毫秒
-        int timeout = 300;
+        // 超时时间默认6000毫秒
+        int timeout = 6000;
         try {
             timeout = Integer.parseInt(icmp.getTimeout());
         } catch (Exception e) {
diff --git a/collector/src/main/java/com/usthe/collector/collect/telnet/TelnetCollectImpl.java b/collector/src/main/java/com/usthe/collector/collect/telnet/TelnetCollectImpl.java
index 940f734..1e07b96 100644
--- a/collector/src/main/java/com/usthe/collector/collect/telnet/TelnetCollectImpl.java
+++ b/collector/src/main/java/com/usthe/collector/collect/telnet/TelnetCollectImpl.java
@@ -38,8 +38,8 @@ public class TelnetCollectImpl extends AbstractCollect {
         }
 
         TelnetProtocol telnet = metrics.getTelnet();
-        // 超时时间默认300毫秒
-        int timeout = 300;
+        // 超时时间默认6000毫秒
+        int timeout = 6000;
         try {
             timeout = Integer.parseInt(telnet.getTimeout());
         } catch (Exception e) {
diff --git a/common/src/main/java/com/usthe/common/entity/job/protocol/SshProtocol.java b/common/src/main/java/com/usthe/common/entity/job/protocol/SshProtocol.java
index 2d11fb8..791c2cd 100644
--- a/common/src/main/java/com/usthe/common/entity/job/protocol/SshProtocol.java
+++ b/common/src/main/java/com/usthe/common/entity/job/protocol/SshProtocol.java
@@ -29,7 +29,7 @@ public class SshProtocol {
     /**
      * 超时时间
      */
-    private String timeout = "6000";
+    private String timeout;
 
     /**
      * 用户名
diff --git a/manager/src/main/resources/define/param/mariadb.yml b/manager/src/main/resources/define/param/mariadb.yml
index 9443d1c..04a06d6 100644
--- a/manager/src/main/resources/define/param/mariadb.yml
+++ b/manager/src/main/resources/define/param/mariadb.yml
@@ -15,7 +15,7 @@ param:
     name: 查询超时时间
     type: number
     required: false
-    defaultValue: 3000
+    defaultValue: 6000
     placeholder: '查询超时时间'
   - field: database
     name: 数据库名称
diff --git a/manager/src/main/resources/define/param/mysql.yml b/manager/src/main/resources/define/param/mysql.yml
index 3cd86f2..79be757 100644
--- a/manager/src/main/resources/define/param/mysql.yml
+++ b/manager/src/main/resources/define/param/mysql.yml
@@ -15,7 +15,7 @@ param:
     name: 查询超时时间
     type: number
     required: false
-    defaultValue: 3000
+    defaultValue: 6000
     placeholder: '查询超时时间'
   - field: database
     name: 数据库名称
diff --git a/manager/src/main/resources/define/param/oracle.yml b/manager/src/main/resources/define/param/oracle.yml
index 395e987..fbef8de 100644
--- a/manager/src/main/resources/define/param/oracle.yml
+++ b/manager/src/main/resources/define/param/oracle.yml
@@ -15,7 +15,7 @@ param:
     name: 查询超时时间
     type: number
     required: false
-    defaultValue: 3000
+    defaultValue: 6000
     placeholder: '查询超时时间'
   - field: database
     name: 数据库名称
diff --git a/manager/src/main/resources/define/param/ping.yml b/manager/src/main/resources/define/param/ping.yml
index 491c16d..3ff5cbe 100644
--- a/manager/src/main/resources/define/param/ping.yml
+++ b/manager/src/main/resources/define/param/ping.yml
@@ -17,4 +17,4 @@ param:
     range: '[0,100000]'
     required: true
     placeholder: '请输入超时时间,单位毫秒'
-    defaultValue: 3000
\ No newline at end of file
+    defaultValue: 6000
\ No newline at end of file
diff --git a/manager/src/main/resources/define/param/port.yml b/manager/src/main/resources/define/param/port.yml
index b22bd76..3f905ee 100644
--- a/manager/src/main/resources/define/param/port.yml
+++ b/manager/src/main/resources/define/param/port.yml
@@ -24,4 +24,4 @@ param:
     range: '[0,100000]'
     required: true
     placeholder: '请输入超时时间,单位毫秒'
-    defaultValue: 3000
\ No newline at end of file
+    defaultValue: 6000
\ No newline at end of file
diff --git a/manager/src/main/resources/define/param/postgresql.yml b/manager/src/main/resources/define/param/postgresql.yml
index 9ad189c..0ed5d9c 100644
--- a/manager/src/main/resources/define/param/postgresql.yml
+++ b/manager/src/main/resources/define/param/postgresql.yml
@@ -15,7 +15,7 @@ param:
     name: 查询超时时间
     type: number
     required: false
-    defaultValue: 3000
+    defaultValue: 6000
     placeholder: '查询超时时间'
   - field: database
     name: 数据库名称
diff --git a/manager/src/main/resources/define/param/sqlserver.yml b/manager/src/main/resources/define/param/sqlserver.yml
index d69707f..a0fb0b6 100644
--- a/manager/src/main/resources/define/param/sqlserver.yml
+++ b/manager/src/main/resources/define/param/sqlserver.yml
@@ -15,7 +15,7 @@ param:
     name: 查询超时时间
     type: number
     required: false
-    defaultValue: 3000
+    defaultValue: 6000
     placeholder: '查询超时时间'
   - field: database
     name: 数据库名称
diff --git a/manager/src/main/resources/define/param/telnet.yml b/manager/src/main/resources/define/param/telnet.yml
index 9a47e93..7046baf 100644
--- a/manager/src/main/resources/define/param/telnet.yml
+++ b/manager/src/main/resources/define/param/telnet.yml
@@ -24,4 +24,4 @@ param:
     range: '[0,100000]'
     required: true
     placeholder: '请输入超时时间,单位毫秒'
-    defaultValue: 3000
\ No newline at end of file
+    defaultValue: 6000
\ No newline at end of file
diff --git a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html
index 4790d27..564eb53 100644
--- a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html
+++ b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html
@@ -86,7 +86,7 @@
           >{{ paramDefine.name }}
         </nz-form-label>
         <nz-form-control *ngIf="paramDefine.type === 'password'" nzSpan="8" [nzErrorTip]="'validation.required' | i18n">
-          <nz-input-group [nzSuffix]="suffixTemplate">
+          <nz-input-group [nzSuffix]="suffixTemplate" style="width: 100%">
             <input
               [type]="passwordVisible ? 'text' : 'password'"
               nz-input
diff --git a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html
index 80477da..25fad0b 100644
--- a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html
+++ b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html
@@ -95,7 +95,7 @@
           >{{ paramDefine.name }}
         </nz-form-label>
         <nz-form-control *ngIf="paramDefine.type === 'password'" nzSpan="8" [nzErrorTip]="'validation.required' | i18n">
-          <nz-input-group [nzSuffix]="suffixTemplate">
+          <nz-input-group [nzSuffix]="suffixTemplate" style="width: 100%">
             <input
               [type]="passwordVisible ? 'text' : 'password'"
               nz-input