|
@@ -32,7 +32,6 @@ import java.util.Map;
|
|
**/
|
|
**/
|
|
public class RestTemplateUtils {
|
|
public class RestTemplateUtils {
|
|
|
|
|
|
-
|
|
|
|
private Logger logger = LoggerFactory.getLogger(RestTemplateUtils.class);
|
|
private Logger logger = LoggerFactory.getLogger(RestTemplateUtils.class);
|
|
public RestTemplate restTemplate;
|
|
public RestTemplate restTemplate;
|
|
|
|
|
|
@@ -108,7 +107,6 @@ public class RestTemplateUtils {
|
|
// 替换String的默认字符集
|
|
// 替换String的默认字符集
|
|
getRestTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
|
|
getRestTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
|
|
|
|
|
|
-
|
|
|
|
//设置HTTP请求头信息,实现编码等
|
|
//设置HTTP请求头信息,实现编码等
|
|
headers = new HttpHeaders();
|
|
headers = new HttpHeaders();
|
|
MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
|
|
MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
|
|
@@ -368,7 +366,7 @@ public class RestTemplateUtils {
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
if (!(e instanceof CoolingException)) {
|
|
if (!(e instanceof CoolingException)) {
|
|
- logger.warn("第三方调用异常:"+ e.getMessage());
|
|
|
|
|
|
+ logger.warn("第三方调用异常:" + e.getMessage());
|
|
}
|
|
}
|
|
t.setStatus(e.getClass().getSimpleName());
|
|
t.setStatus(e.getClass().getSimpleName());
|
|
if (restFallback != null) {
|
|
if (restFallback != null) {
|
|
@@ -411,7 +409,7 @@ public class RestTemplateUtils {
|
|
}
|
|
}
|
|
t.setStatus(Transaction.SUCCESS);
|
|
t.setStatus(Transaction.SUCCESS);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- logger.warn("------ 第三方接口调用失败 : "+ e.getMessage());
|
|
|
|
|
|
+ logger.warn("------ 第三方接口调用失败 : ",e);
|
|
t.setStatus(e.getClass().getSimpleName());
|
|
t.setStatus(e.getClass().getSimpleName());
|
|
} finally {
|
|
} finally {
|
|
t.complete();
|
|
t.complete();
|