From 35f5bda51a31566110be9c63101f452550702259 Mon Sep 17 00:00:00 2001
From: tomsun28 <tomsun28@outlook.com>
Date: Fri, 4 Mar 2022 13:54:30 +0800
Subject: [PATCH] [manager,webapp]bugfix website monitor path Illegal character
 in path at index

---
 .../usthe/collector/dispatch/timer/WheelTimerTask.java |  2 ++
 .../main/java/com/usthe/common/util/IpDomainUtil.java  |  1 +
 .../usthe/manager/service/impl/MonitorServiceImpl.java |  8 +++++++-
 .../monitor/monitor-edit/monitor-edit.component.ts     | 10 ++++++++++
 .../monitor/monitor-new/monitor-new.component.ts       | 10 ++++++++++
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/collector/src/main/java/com/usthe/collector/dispatch/timer/WheelTimerTask.java b/collector/src/main/java/com/usthe/collector/dispatch/timer/WheelTimerTask.java
index fb50aed..f950e3f 100644
--- a/collector/src/main/java/com/usthe/collector/dispatch/timer/WheelTimerTask.java
+++ b/collector/src/main/java/com/usthe/collector/dispatch/timer/WheelTimerTask.java
@@ -55,6 +55,8 @@ public class WheelTimerTask implements TimerTask {
                             log.error("Aes Decode value {} error.", item.getValue());
                         }
                         item.setValue(decodeValue);
+                    } else if (item.getValue() != null && item.getValue() instanceof String) {
+                        item.setValue(((String) item.getValue()).trim());
                     }
                 })
                 .collect(Collectors.toMap(Configmap::getKey, item -> item));
diff --git a/common/src/main/java/com/usthe/common/util/IpDomainUtil.java b/common/src/main/java/com/usthe/common/util/IpDomainUtil.java
index 5f922c8..25ab413 100644
--- a/common/src/main/java/com/usthe/common/util/IpDomainUtil.java
+++ b/common/src/main/java/com/usthe/common/util/IpDomainUtil.java
@@ -33,6 +33,7 @@ public class IpDomainUtil {
         if (ipDomain == null || "".equals(ipDomain)) {
             return false;
         }
+        ipDomain = ipDomain.trim();
         if (LOCALHOST.equalsIgnoreCase(ipDomain)) {
             return true;
         }
diff --git a/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java b/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java
index d795392..e9e130c 100644
--- a/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java
+++ b/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java
@@ -126,9 +126,15 @@ public class MonitorServiceImpl implements MonitorService {
     public void validate(MonitorDto monitorDto, Boolean isModify) throws IllegalArgumentException {
         // 请求监控参数与监控参数定义映射校验匹配
         Monitor monitor = monitorDto.getMonitor();
+        monitor.setHost(monitor.getHost().trim());
+        monitor.setName(monitor.getName().trim());
         Map<String, Param> paramMap = monitorDto.getParams()
                 .stream()
-                .peek(param -> param.setMonitorId(monitor.getId()))
+                .peek(param -> {
+                    param.setMonitorId(monitor.getId());
+                    String value = param.getValue() == null ? null : param.getValue().trim();
+                    param.setValue(value);
+                })
                 .collect(Collectors.toMap(Param::getField, param -> param));
         // 校验名称唯一性
         if (isModify != null) {
diff --git a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts
index adcc88d..5ec9578 100644
--- a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts
+++ b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts
@@ -112,11 +112,16 @@ export class MonitorEditComponent implements OnInit {
       });
       return;
     }
+    this.monitor.host = this.monitor.host.trim();
+    this.monitor.name = this.monitor.name.trim();
     // todo 暂时单独设置host属性值
     this.params.forEach(param => {
       if (param.field === 'host') {
         param.value = this.monitor.host;
       }
+      if (param.value != null && typeof param.value == 'string') {
+        param.value = (param.value as string).trim();
+      }
     });
     let addMonitor = {
       detected: this.detected,
@@ -151,11 +156,16 @@ export class MonitorEditComponent implements OnInit {
       });
       return;
     }
+    this.monitor.host = this.monitor.host.trim();
+    this.monitor.name = this.monitor.name.trim();
     // todo 暂时单独设置host属性值
     this.params.forEach(param => {
       if (param.field === 'host') {
         param.value = this.monitor.host;
       }
+      if (param.value != null && typeof param.value == 'string') {
+        param.value = (param.value as string).trim();
+      }
     });
     let detectMonitor = {
       detected: this.detected,
diff --git a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts
index f97ea5c..a93a36e 100644
--- a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts
+++ b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts
@@ -93,11 +93,16 @@ export class MonitorNewComponent implements OnInit {
       });
       return;
     }
+    this.monitor.host = this.monitor.host.trim();
+    this.monitor.name = this.monitor.name.trim();
     // todo 暂时单独设置host属性值
     this.params.forEach(param => {
       if (param.field === 'host') {
         param.value = this.monitor.host;
       }
+      if (param.value != null && typeof param.value == 'string') {
+        param.value = (param.value as string).trim();
+      }
     });
     let addMonitor = {
       detected: this.detected,
@@ -132,11 +137,16 @@ export class MonitorNewComponent implements OnInit {
       });
       return;
     }
+    this.monitor.host = this.monitor.host.trim();
+    this.monitor.name = this.monitor.name.trim();
     // todo 暂时单独设置host属性值
     this.params.forEach(param => {
       if (param.field === 'host') {
         param.value = this.monitor.host;
       }
+      if (param.value != null && typeof param.value == 'string') {
+        param.value = (param.value as string).trim();
+      }
     });
     let detectMonitor = {
       detected: true,