gitee/yudao-cloud
1
0
Fork 0
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git synced 2025-12-26 07:06:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
YunaiV 2025-11-22 16:12:56 +08:00
parent a5aa2c84e3
commit a0b7777783
4 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
View File

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

8
yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/api/event/CrmContractStatusListener.java
View File

@ -1,8 +1,10 @@
package cn.iocoder.yudao.module.bpm.api.event;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmHttpRequestUtils;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
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 {
@Resource
private RestTemplate loadBalancedRestTemplate;
@Override
public String getProcessDefinitionKey() {
return "crm-contract-audit";
@ -19,7 +24,8 @@ public class CrmContractStatusListener extends BpmProcessInstanceStatusEventList
@Override
public void onEvent(@RequestBody @Valid BpmProcessInstanceStatusEvent 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);
}
}

8
yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/api/event/CrmReceivableStatusListener.java
View File

@ -1,8 +1,10 @@
package cn.iocoder.yudao.module.bpm.api.event;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmHttpRequestUtils;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
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 {
@Resource
private RestTemplate loadBalancedRestTemplate;
@Override
public String getProcessDefinitionKey() {
return "crm-receivable-audit";
@ -19,7 +24,8 @@ public class CrmReceivableStatusListener extends BpmProcessInstanceStatusEventLi
@Override
public void onEvent(@RequestBody @Valid BpmProcessInstanceStatusEvent 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);
}
}

8
yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmHttpRequestUtils.java
View File

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