[manager,collector]feature 修改默认超时时间3000毫秒为6000毫秒 (#55)

2022-04-02 23:02:37 +08:00
parent fbf7ebd834
commit 0cf66f32ff
14 changed files with 17 additions and 17 deletions
--- 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) {
--- 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) {
--- 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) {
--- 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;

    /**
     * 用户名
--- 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: 数据库名称
--- 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: 数据库名称
--- 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: 数据库名称
--- 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
+    defaultValue: 6000
--- 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
+    defaultValue: 6000
--- 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: 数据库名称
--- 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: 数据库名称
--- 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
+    defaultValue: 6000
--- 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
--- 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