Merge branch 'master' into fixPopUpKeepData

.github/workflows/doc-build-test.yml

@@ -0,0 +1,42 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: DOC CI
+
+on:
+  push:
+    branches: [ master, dev]
+    paths:
+      - 'home/**'
+  pull_request:
+    branches: [ master, dev]
+    paths:
+      - 'home/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: NPM INSTALL
+        working-directory: home
+        run: npm install
+      - name: NPM BUILD
+        working-directory: home
+        run: npm run build

CONTRIBUTING.md

@@ -205,7 +205,7 @@ Add WeChat account `tan-cloud` to pull you into the WeChat group.
 
 6. 待本地后端启动后，在web-app目录下启动本地前端 `ng serve --open`
 
-7. 浏览器访问 localhost:4200 即可开始，默认账号密码 admin/hertzbeat**
+7. 浏览器访问 localhost:4200 即可开始，默认账号密码 *admin/hertzbeat*
 
 ### 寻找任务  
 

collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/CacheIdentifier.java

@@ -21,7 +21,6 @@
 import lombok.Builder;
 import lombok.Data;
 
-
 /**
  * resource identifier in cache
  */

collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java

@@ -17,7 +17,6 @@
 
 package org.apache.hertzbeat.collector.collect.common.cache;
 
-
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import java.util.Map;
@@ -198,15 +197,18 @@ public Optional<C> getCache(T key, boolean refreshCache) {
             cacheMap.remove(key);
             return Optional.empty();
         }
-        C value = cacheMap.get(key);
-        if (value == null) {
-            log.error("[connection common cache] value is null, remove it, key {}.", key);
-            cacheMap.remove(key);
-            timeoutMap.remove(key);
-        } else if (refreshCache) {
-            cacheTime[0] = System.currentTimeMillis();
-            timeoutMap.put(key, cacheTime);
-        }
+        C value = cacheMap.compute(key, (k, v) -> {
+            if (v == null) {
+                log.error("[connection common cache] value is null, remove it, key {}.", key);
+                timeoutMap.remove(key);
+                return null;
+            }
+            if (refreshCache) {
+                cacheTime[0] = System.currentTimeMillis();
+                timeoutMap.put(key, cacheTime);
+            }
+            return v;
+        });
         return Optional.ofNullable(value);
     }
 

collector/src/main/java/org/apache/hertzbeat/collector/collect/common/ssh/CommonSshClient.java

@@ -26,7 +26,6 @@
 import org.apache.sshd.common.kex.BuiltinDHFactories;
 import org.apache.sshd.core.CoreModuleProperties;
 
-
 /**
  * common ssh pool client
  */

collector/src/main/java/org/apache/hertzbeat/collector/collect/database/JdbcSpiLoader.java

@@ -31,7 +31,6 @@
 @Order(value = Ordered.HIGHEST_PRECEDENCE)
 public class JdbcSpiLoader implements CommandLineRunner {
 
-
     @Override
     public void run(String... args) throws Exception {
         log.info("start load jdbc drivers");

collector/src/main/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImpl.java

@@ -90,7 +90,6 @@ public class DnsCollectImpl extends AbstractCollect {
     private static final String AUTHORITY_ROW_COUNT = "authorityRowCount";
     private static final String ADDITIONAL_ROW_COUNT = "additionalRowCount";
 
-
     @Override
     public void preCheck(Metrics metrics) throws IllegalArgumentException {
         // compatible with monitoring template configurations of older versions
@@ -207,7 +206,6 @@ private List<String> getSectionInfo(Message message, int section) {
         return infoList;
     }
 
-
     @Data
     @Builder
     @NoArgsConstructor