From 3790f7d583cde01943478852f5b5ea6e0ef4e692 Mon Sep 17 00:00:00 2001 From: lbw Date: Tue, 28 Dec 2021 10:00:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:loud=5Fsound:=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=BD=91=E5=85=B3=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E8=BE=93=E5=87=BA=E6=97=A5=E5=BF=97=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=20=E4=B8=8D=E8=BE=93=E5=87=BA=E9=94=99=E8=AF=AF=E5=A0=86?= =?UTF-8?q?=E6=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gateway/configuration/GlobalExceptionConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GlobalExceptionConfiguration.java b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GlobalExceptionConfiguration.java index 9cc5f0902..24579ee19 100644 --- a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GlobalExceptionConfiguration.java +++ b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GlobalExceptionConfiguration.java @@ -46,7 +46,7 @@ public class GlobalExceptionConfiguration implements ErrorWebExceptionHandler { return response.writeWith(Mono.fromSupplier(() -> { DataBufferFactory bufferFactory = response.bufferFactory(); try { - log.error("Error Spring Cloud Gateway :", ex); + log.error("Error Spring Cloud Gateway : {}", ex.getMessage()); return bufferFactory.wrap(objectMapper.writeValueAsBytes(R.failed(ex.getMessage()))); } catch (JsonProcessingException e) { From 86472c9a624da0e7243ba1a57d1c0d048a35e441 Mon Sep 17 00:00:00 2001 From: lbw Date: Wed, 29 Dec 2021 12:33:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.?= =?UTF-8?q?=20close=20#3498=20@WithMockOAuth2User=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E5=9C=A84.2=E7=89=88=E6=9C=AC=E4=B8=8B=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/WithMockSecurityContextFactory.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/WithMockSecurityContextFactory.java b/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/WithMockSecurityContextFactory.java index 6937bb1df..7849584fc 100644 --- a/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/WithMockSecurityContextFactory.java +++ b/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/WithMockSecurityContextFactory.java @@ -1,14 +1,11 @@ package com.pig4cloud.pigx.test; -import java.nio.charset.StandardCharsets; - import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; import com.pig4cloud.pigx.test.annotation.WithMockOAuth2User; - import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -24,6 +21,8 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; +import java.nio.charset.StandardCharsets; + /** * @author lengleng * @date 2020/9/22 @@ -80,9 +79,16 @@ public class WithMockSecurityContextFactory implements WithSecurityContextFactor RestTemplate restTemplate = SpringContextHolder.getBean(RestTemplate.class); // 优先获取配置文件URI 配置 - String url = StrUtil.isBlank(clientProperties.getAccessTokenUri()) ? TOKEN_URL - : clientProperties.getAccessTokenUri(); - String result = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class).getBody(); + String result; + if (StrUtil.isBlank(clientProperties.getAccessTokenUri())) { + result = restTemplate.exchange(TOKEN_URL, HttpMethod.POST, requestEntity, String.class).getBody(); + } + else { + result = new RestTemplate() + .exchange(clientProperties.getAccessTokenUri(), HttpMethod.POST, requestEntity, String.class) + .getBody(); + } + return JSONUtil.parseObj(result).getStr("access_token"); } From e6a8bd9c73f9a970ec74b9532340ff648b109de3 Mon Sep 17 00:00:00 2001 From: lbw Date: Wed, 29 Dec 2021 13:18:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:lock:=20Fixing=20security=20issues.=20Apac?= =?UTF-8?q?he=20Log4j=20=E4=B8=AD=E5=87=BA=E7=8E=B0=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E4=BB=A3=E7=A0=81=E6=89=A7=E8=A1=8C=E6=BC=8F?= =?UTF-8?q?=E6=B4=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-common/pigx-common-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index e2cf84ced..94ef011b7 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -34,7 +34,7 @@ 2.3.0 3.0.52.ALL 1.11.543 - 2.17.0 + 2.17.1 0.0.23 0.33.0 1.0.0