diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/CustomMessageConverter.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/CustomMessageConverter.java index 3f8703627..98a20d883 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/CustomMessageConverter.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/CustomMessageConverter.java @@ -1,5 +1,6 @@ package com.logpm.distribution.config; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -25,6 +26,7 @@ import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.io.Serializable; import java.io.UnsupportedEncodingException; +import java.util.List; import java.util.Map; /** @@ -64,7 +66,16 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve } } Map headers = properties.getHeaders(); - ThreadLocalUtil.put("bladeContext", headers); + HttpHeaders httpHeaders = new HttpHeaders(); + for (Map.Entry entry : headers.entrySet()) { + if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) { + List value = (List) entry.getValue(); + for (Object o : value) { + httpHeaders.add(entry.getKey(), String.valueOf(o)); + } + } + } + ThreadLocalUtil.put("bladeContext", httpHeaders); Object bladeUser = headers.get("bladeUser"); MockHttpServletRequest request = new MockHttpServletRequest(); BladeUser bladeUser1 = JSONUtil.toBean(bladeUser.toString(), BladeUser.class); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/config/CustomMessageConverter.java b/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/config/CustomMessageConverter.java index 71b65cfac..ae10bd39b 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/config/CustomMessageConverter.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/config/CustomMessageConverter.java @@ -1,5 +1,6 @@ package com.logpm.factorydata.base.config; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -25,6 +26,7 @@ import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.io.Serializable; import java.io.UnsupportedEncodingException; +import java.util.List; import java.util.Map; /** @@ -64,7 +66,16 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve } } Map headers = properties.getHeaders(); - ThreadLocalUtil.put("bladeContext", headers); + HttpHeaders httpHeaders = new HttpHeaders(); + for (Map.Entry entry : headers.entrySet()) { + if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) { + List value = (List) entry.getValue(); + for (Object o : value) { + httpHeaders.add(entry.getKey(), String.valueOf(o)); + } + } + } + ThreadLocalUtil.put("bladeContext", httpHeaders); Object bladeUser = headers.get("bladeUser"); MockHttpServletRequest request = new MockHttpServletRequest(); BladeUser bladeUser1 = JSONUtil.toBean(bladeUser.toString(), BladeUser.class); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/config/CustomMessageConverter.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/config/CustomMessageConverter.java index f50a2a6cc..ca7873ccf 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/config/CustomMessageConverter.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/config/CustomMessageConverter.java @@ -1,5 +1,6 @@ package com.logpm.factorydata.jinpai.config; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -25,6 +26,7 @@ import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.io.Serializable; import java.io.UnsupportedEncodingException; +import java.util.List; import java.util.Map; /** @@ -64,7 +66,16 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve } } Map headers = properties.getHeaders(); - ThreadLocalUtil.put("bladeContext", headers); + HttpHeaders httpHeaders = new HttpHeaders(); + for (Map.Entry entry : headers.entrySet()) { + if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) { + List value = (List) entry.getValue(); + for (Object o : value) { + httpHeaders.add(entry.getKey(), String.valueOf(o)); + } + } + } + ThreadLocalUtil.put("bladeContext", httpHeaders); Object bladeUser = headers.get("bladeUser"); MockHttpServletRequest request = new MockHttpServletRequest(); BladeUser bladeUser1 = JSONUtil.toBean(bladeUser.toString(), BladeUser.class); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/CustomMessageConverter.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/CustomMessageConverter.java index ffa9e4a7e..dcdce3e93 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/CustomMessageConverter.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/CustomMessageConverter.java @@ -1,5 +1,6 @@ package com.logpm.factorydata.olo.config; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -25,6 +26,7 @@ import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.io.Serializable; import java.io.UnsupportedEncodingException; +import java.util.List; import java.util.Map; /** @@ -64,7 +66,16 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve } } Map headers = properties.getHeaders(); - ThreadLocalUtil.put("bladeContext", headers); + HttpHeaders httpHeaders = new HttpHeaders(); + for (Map.Entry entry : headers.entrySet()) { + if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) { + List value = (List) entry.getValue(); + for (Object o : value) { + httpHeaders.add(entry.getKey(), String.valueOf(o)); + } + } + } + ThreadLocalUtil.put("bladeContext", httpHeaders); Object bladeUser = headers.get("bladeUser"); MockHttpServletRequest request = new MockHttpServletRequest(); BladeUser bladeUser1 = JSONUtil.toBean(bladeUser.toString(), BladeUser.class); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/config/CustomMessageConverter.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/config/CustomMessageConverter.java index acc4e05ce..97ba8635b 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/config/CustomMessageConverter.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/config/CustomMessageConverter.java @@ -1,5 +1,6 @@ package com.logpm.factorydata.suofeiya.config; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -25,6 +26,7 @@ import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.io.Serializable; import java.io.UnsupportedEncodingException; +import java.util.List; import java.util.Map; /** @@ -64,7 +66,16 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve } } Map headers = properties.getHeaders(); - ThreadLocalUtil.put("bladeContext", headers); + HttpHeaders httpHeaders = new HttpHeaders(); + for (Map.Entry entry : headers.entrySet()) { + if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) { + List value = (List) entry.getValue(); + for (Object o : value) { + httpHeaders.add(entry.getKey(), String.valueOf(o)); + } + } + } + ThreadLocalUtil.put("bladeContext", httpHeaders); Object bladeUser = headers.get("bladeUser"); MockHttpServletRequest request = new MockHttpServletRequest(); BladeUser bladeUser1 = JSONUtil.toBean(bladeUser.toString(), BladeUser.class); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/config/CustomMessageConverter.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/config/CustomMessageConverter.java index 89e07ecef..c79058f1a 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/config/CustomMessageConverter.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/config/CustomMessageConverter.java @@ -1,5 +1,6 @@ package com.logpm.factorydata.zbom.config; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -25,6 +26,7 @@ import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.io.Serializable; import java.io.UnsupportedEncodingException; +import java.util.List; import java.util.Map; /** @@ -64,7 +66,16 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve } } Map headers = properties.getHeaders(); - ThreadLocalUtil.put("bladeContext", headers); + HttpHeaders httpHeaders = new HttpHeaders(); + for (Map.Entry entry : headers.entrySet()) { + if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) { + List value = (List) entry.getValue(); + for (Object o : value) { + httpHeaders.add(entry.getKey(), String.valueOf(o)); + } + } + } + ThreadLocalUtil.put("bladeContext", httpHeaders); Object bladeUser = headers.get("bladeUser"); MockHttpServletRequest request = new MockHttpServletRequest(); BladeUser bladeUser1 = JSONUtil.toBean(bladeUser.toString(), BladeUser.class); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/CustomMessageConverter.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/CustomMessageConverter.java index deb695b4c..fa31229ef 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/CustomMessageConverter.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/CustomMessageConverter.java @@ -1,5 +1,6 @@ package com.logpm.factory.config; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -25,6 +26,7 @@ import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.io.Serializable; import java.io.UnsupportedEncodingException; +import java.util.List; import java.util.Map; /** @@ -64,7 +66,16 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve } } Map headers = properties.getHeaders(); - ThreadLocalUtil.put("bladeContext", headers); + HttpHeaders httpHeaders = new HttpHeaders(); + for (Map.Entry entry : headers.entrySet()) { + if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) { + List value = (List) entry.getValue(); + for (Object o : value) { + httpHeaders.add(entry.getKey(), String.valueOf(o)); + } + } + } + ThreadLocalUtil.put("bladeContext", httpHeaders); Object bladeUser = headers.get("bladeUser"); MockHttpServletRequest request = new MockHttpServletRequest(); BladeUser bladeUser1 = JSONUtil.toBean(bladeUser.toString(), BladeUser.class); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/CustomMessageConverter.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/CustomMessageConverter.java index 420eaaaa9..fdd2c51e7 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/CustomMessageConverter.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/CustomMessageConverter.java @@ -1,5 +1,6 @@ package com.logpm.trunkline.config; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -25,6 +26,7 @@ import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.io.Serializable; import java.io.UnsupportedEncodingException; +import java.util.List; import java.util.Map; /** @@ -64,7 +66,16 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve } } Map headers = properties.getHeaders(); - ThreadLocalUtil.put("bladeContext", headers); + HttpHeaders httpHeaders = new HttpHeaders(); + for (Map.Entry entry : headers.entrySet()) { + if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) { + List value = (List) entry.getValue(); + for (Object o : value) { + httpHeaders.add(entry.getKey(), String.valueOf(o)); + } + } + } + ThreadLocalUtil.put("bladeContext", httpHeaders); Object bladeUser = headers.get("bladeUser"); MockHttpServletRequest request = new MockHttpServletRequest(); BladeUser bladeUser1 = JSONUtil.toBean(bladeUser.toString(), BladeUser.class); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/CustomMessageConverter.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/CustomMessageConverter.java index bdba5446b..95b7b5636 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/CustomMessageConverter.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/CustomMessageConverter.java @@ -1,5 +1,6 @@ package com.logpm.warehouse.config; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -25,6 +26,7 @@ import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.io.Serializable; import java.io.UnsupportedEncodingException; +import java.util.List; import java.util.Map; /** @@ -64,7 +66,16 @@ public class CustomMessageConverter extends AllowedListDeserializingMessageConve } } Map headers = properties.getHeaders(); - ThreadLocalUtil.put("bladeContext", headers); + HttpHeaders httpHeaders = new HttpHeaders(); + for (Map.Entry entry : headers.entrySet()) { + if (StrUtil.equals("Blade-Auth", entry.getKey()) || StrUtil.equals("Authorization", entry.getKey())) { + List value = (List) entry.getValue(); + for (Object o : value) { + httpHeaders.add(entry.getKey(), String.valueOf(o)); + } + } + } + ThreadLocalUtil.put("bladeContext", httpHeaders); Object bladeUser = headers.get("bladeUser"); MockHttpServletRequest request = new MockHttpServletRequest(); BladeUser bladeUser1 = JSONUtil.toBean(bladeUser.toString(), BladeUser.class);