Merge branch 'dev'

epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java

@@ -13,6 +13,7 @@ import com.epmet.constant.TokenHeaderKeyConstant;
 import com.epmet.openapi.constant.AuthTypes;
 import com.epmet.openapi.constant.RequestParamKeys;
 import com.epmet.utils.ServerHttpRequestUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,9 +68,11 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 			}
 
 			//添加流水号
-			exchange.getRequest().mutate().header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{getTransactionSerial()});
-
 			ServerHttpRequest request = exchange.getRequest();
+			List<String> tranSerials = request.getHeaders().get(AppClientConstant.TRANSACTION_SERIAL_KEY);
+			if (CollectionUtils.isEmpty(tranSerials) || StringUtils.isBlank(tranSerials.get(0))) {
+				request.mutate().header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{getTransactionSerial()});
+			}
 
 			String authType = getAuthType(request);
 			String requestUri = request.getPath().pathWithinApplication().value();