fix:【bpm】LoadBalanced 的 RestTemplate 场景下,影响普通域名的访问,解决 https://gitee.com/zhijiantianya/yudao-cloud/issues/ICY7H3 问题

master
YunaiV 3 months ago
parent a5aa2c84e3
commit a0b7777783

@ -21,6 +21,7 @@ import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Primary;
import org.springframework.util.AntPathMatcher; import org.springframework.util.AntPathMatcher;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@ -146,9 +147,20 @@ public class YudaoWebAutoConfiguration {
*/ */
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
@LoadBalanced @Primary
public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) { public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) {
return restTemplateBuilder.build(); return restTemplateBuilder.build();
} }
/**
* RestTemplate
*
* @param restTemplateBuilder {@link RestTemplateAutoConfiguration#restTemplateBuilder}
*/
@Bean
@LoadBalanced
public RestTemplate loadBalancedRestTemplate(RestTemplateBuilder restTemplateBuilder) {
return restTemplateBuilder.build();
}
} }

@ -1,8 +1,10 @@
package cn.iocoder.yudao.module.bpm.api.event; package cn.iocoder.yudao.module.bpm.api.event;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmHttpRequestUtils; import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmHttpRequestUtils;
import jakarta.annotation.Resource;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.client.RestTemplate;
/** /**
* *
@ -11,6 +13,9 @@ import org.springframework.web.bind.annotation.RequestBody;
*/ */
public class CrmContractStatusListener extends BpmProcessInstanceStatusEventListener { public class CrmContractStatusListener extends BpmProcessInstanceStatusEventListener {
@Resource
private RestTemplate loadBalancedRestTemplate;
@Override @Override
public String getProcessDefinitionKey() { public String getProcessDefinitionKey() {
return "crm-contract-audit"; return "crm-contract-audit";
@ -19,7 +24,8 @@ public class CrmContractStatusListener extends BpmProcessInstanceStatusEventList
@Override @Override
public void onEvent(@RequestBody @Valid BpmProcessInstanceStatusEvent event) { public void onEvent(@RequestBody @Valid BpmProcessInstanceStatusEvent event) {
BpmHttpRequestUtils.executeBpmHttpRequest(event, BpmHttpRequestUtils.executeBpmHttpRequest(event,
"http://crm-server/rpc-api/crm/contract/update-audit-status"); "http://crm-server/rpc-api/crm/contract/update-audit-status",
loadBalancedRestTemplate);
} }
} }

@ -1,8 +1,10 @@
package cn.iocoder.yudao.module.bpm.api.event; package cn.iocoder.yudao.module.bpm.api.event;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmHttpRequestUtils; import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmHttpRequestUtils;
import jakarta.annotation.Resource;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.client.RestTemplate;
/** /**
* *
@ -11,6 +13,9 @@ import org.springframework.web.bind.annotation.RequestBody;
*/ */
public class CrmReceivableStatusListener extends BpmProcessInstanceStatusEventListener { public class CrmReceivableStatusListener extends BpmProcessInstanceStatusEventListener {
@Resource
private RestTemplate loadBalancedRestTemplate;
@Override @Override
public String getProcessDefinitionKey() { public String getProcessDefinitionKey() {
return "crm-receivable-audit"; return "crm-receivable-audit";
@ -19,7 +24,8 @@ public class CrmReceivableStatusListener extends BpmProcessInstanceStatusEventLi
@Override @Override
public void onEvent(@RequestBody @Valid BpmProcessInstanceStatusEvent event) { public void onEvent(@RequestBody @Valid BpmProcessInstanceStatusEvent event) {
BpmHttpRequestUtils.executeBpmHttpRequest(event, BpmHttpRequestUtils.executeBpmHttpRequest(event,
"http://crm-server/rpc-api/crm/receivable/update-audit-status"); "http://crm-server/rpc-api/crm/receivable/update-audit-status",
loadBalancedRestTemplate);
} }
} }

@ -80,6 +80,13 @@ public class BpmHttpRequestUtils {
public static void executeBpmHttpRequest(BpmProcessInstanceStatusEvent event, public static void executeBpmHttpRequest(BpmProcessInstanceStatusEvent event,
String url) { String url) {
RestTemplate restTemplate = SpringUtils.getBean(RestTemplate.class);
executeBpmHttpRequest(event, url, restTemplate);
}
public static void executeBpmHttpRequest(BpmProcessInstanceStatusEvent event,
String url,
RestTemplate restTemplate) {
// 1.1 设置请求头 // 1.1 设置请求头
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON); headers.setContentType(MediaType.APPLICATION_JSON);
@ -102,7 +109,6 @@ public class BpmHttpRequestUtils {
// } // }
// 2. 发起请求 // 2. 发起请求
RestTemplate restTemplate = SpringUtils.getBean(RestTemplate.class);
sendHttpRequest(url, headers, event, restTemplate); sendHttpRequest(url, headers, event, restTemplate);
} }

Loading…
Cancel
Save