Merge remote-tracking branch 'origin/dev' into dev

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java

@@ -1,6 +1,7 @@
 package com.epmet.commons.tools.utils;
 
 import com.alibaba.ttl.TransmittableThreadLocal;
+import com.epmet.commons.tools.constant.StrConstant;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
@@ -46,7 +47,11 @@ public class EpmetRequestHolder {
      * @return
      */
     public static String getHeader(String headerName) {
-        return requestHeaderTtl.get().get(headerName.toLowerCase());
+        Map<String, String> stringStringMap = requestHeaderTtl.get();
+        if (stringStringMap == null){
+            return StrConstant.EPMETY_STR;
+        }
+        return stringStringMap.get(headerName.toLowerCase());
     }
 
     /**