Hotfix register null cluster name instance problem

common/src/main/java/com/alibaba/nacos/common/constant/HttpHeaderConsts.java

@@ -33,6 +33,6 @@ public interface HttpHeaderConsts {
     String CONTENT_ENCODING = "Content-Encoding";
     String CONNECTION = "Connection";
     String REQUEST_ID = "RequestId";
-    String REQUEST_MODULE = "REQUEST_MODULE";
+    String REQUEST_MODULE = "Request-Module";
 
 }

common/src/main/java/com/alibaba/nacos/common/http/param/Query.java

@@ -99,10 +99,12 @@ public String toQueryUrl() {
         int i = entrySet.size();
         for (Map.Entry<String, Object> entry : entrySet) {
             try {
-                urlBuilder.append(entry.getKey()).append("=")
-                        .append(URLEncoder.encode(String.valueOf(entry.getValue()), "UTF-8"));
-                if (i > 1) {
-                    urlBuilder.append("&");
+                if (null != entry.getValue()) {
+                    urlBuilder.append(entry.getKey()).append("=")
+                            .append(URLEncoder.encode(String.valueOf(entry.getValue()), "UTF-8"));
+                    if (i > 1) {
+                        urlBuilder.append("&");
+                    }
                 }
                 i--;
             } catch (UnsupportedEncodingException e) {

common/src/main/java/com/alibaba/nacos/common/utils/ThreadUtils.java

@@ -118,7 +118,7 @@ public static void shutdownThreadPool(ExecutorService executor, Logger logger) {
         while (retry > 0) {
             retry--;
             try {
-                if (executor.awaitTermination(10, TimeUnit.SECONDS)) {
+                if (executor.awaitTermination(1, TimeUnit.SECONDS)) {
                     return;
                 }
             } catch (InterruptedException e) {

common/src/test/java/com/alibaba/nacos/common/http/param/QueryTest.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed 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.
+ */
+
+package com.alibaba.nacos.common.http.param;
+
+import com.alibaba.nacos.api.naming.CommonParams;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class QueryTest {
+
+    @Test
+    public void testToQueryUrl() {
+        Map<String, String> parameters = new HashMap<String, String>();
+        parameters.put(CommonParams.NAMESPACE_ID, "namespace");
+        parameters.put(CommonParams.SERVICE_NAME, "service");
+        parameters.put(CommonParams.GROUP_NAME, "group");
+        parameters.put(CommonParams.CLUSTER_NAME, null);
+        parameters.put("ip", "1.1.1.1");
+        parameters.put("port", String.valueOf(9999));
+        parameters.put("weight", String.valueOf(1.0));
+        parameters.put("ephemeral", String.valueOf(true));
+        String excepted = "groupName=group&namespaceId=namespace&port=9999&ip=1.1.1.1&weight=1.0&ephemeral=true&serviceName=service";
+        assertEquals(excepted, Query.newInstance().initParams(parameters).toQueryUrl());
+    }
+}