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
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) {
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");
}