Merge pull request 'feature_merge' (#11) from feature_merge into master

Reviewed-on: #11

.drone.yml

@@ -29,20 +29,20 @@ steps:
     settings:
       sonar_host: http://10.0.4.16:9000
       sonar_token: squ_d37ffc4085858b55e0b379c68e09a8163b2ba81d
-      sonar_name: pert_test232
+      sonar_name: pert
-      sonar_key: pert_test233
+      sonar_key: pert
       level: TRACE
       showProfiling: true
       branch: ${DRONE_BRANCH}
       build_number: ${DRONE_BUILD_NUMBER}
       build_version: ${DRONE_BUILD_VERSION}
       binaries: .
-#      pr_key: ${DRONE_PULL_REQUEST} # for pull request analysis and decoration
+      pr_key: ${DRONE_PULL_REQUEST} # for pull request analysis and decoration
-#      pr_branch: ${DRONE_SOURCE_BRANCH} # for pull request analysis and decoration
+      pr_branch: ${DRONE_SOURCE_BRANCH} # for pull request analysis and decoration
-#      pr_base:  ${DRONE_TARGET_BRANCH} # for pull request analysis and decoration
+      pr_base:  ${DRONE_TARGET_BRANCH} # for pull request analysis and decoration
-#      sonar_pr_key: ${DRONE_PULL_REQUEST} # for pull request analysis and decoration
+      sonar_pr_key: ${DRONE_PULL_REQUEST} # for pull request analysis and decoration
-#      sonar_pr_branch: ${DRONE_SOURCE_BRANCH} # for pull request analysis and decoration
+      sonar_pr_branch: ${DRONE_SOURCE_BRANCH} # for pull request analysis and decoration
-#      sonar_pr_base: ${DRONE_TARGET_BRANCH} # for pull request analysis and decoration
+      sonar_pr_base: ${DRONE_TARGET_BRANCH} # for pull request analysis and decoration
 
 #kind: pipeline
 #type: exec

common/common-base/src/main/java/com/hlbd/common/base/utils/CollectUtils.java

@@ -1,8 +1,14 @@
 package com.hlbd.common.base.utils;
 
+import com.hlbd.common.base.common.Times;
+import com.sun.jndi.toolkit.url.UrlUtil;
+
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
+import java.net.URLEncoder;
 import java.util.*;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.stream.Collectors;
 
 public class CollectUtils {
     public static void main(String[] args) throws MalformedURLException, UnsupportedEncodingException {

hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java

@@ -18,7 +18,7 @@ public class ClientApplication {
 
     public static void main(String[] args) {
 
-        System.out.println("demo23444");
+        System.out.println("demo");
 
         SpringApplication.run(ClientApplication.class, args);
     }