github-forks
/
spring-cloud-alibaba
mirror of https://github.com/alibaba/spring-cloud-alibaba.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #804 from sundong1982/master

Browse Source 
change fescar to seata
pull/807/head
format 6 years ago committed by GitHub
parent b9f70bfb8b ab819291e7
commit 56b107f07a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/file.conf
Unescape Escape View File

@ -28,7 +28,7 @@ transport {
} }
service { service {
#vgroup->rgroup #vgroup->rgroup
vgroup_mapping.account-service-fescar-service-group = "default" vgroup_mapping.account-service-seata-service-group = "default"
#only support single node #only support single node
default.grouplist = "127.0.0.1:8091" default.grouplist = "127.0.0.1:8091"
#degrade current not support #degrade current not support

2
spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/file.conf
Unescape Escape View File

@ -28,7 +28,7 @@ transport {
} }
service { service {
#vgroup->rgroup #vgroup->rgroup
vgroup_mapping.business-service-fescar-service-group = "default" vgroup_mapping.business-service-seata-service-group = "default"
#only support single node #only support single node
default.grouplist = "127.0.0.1:8091" default.grouplist = "127.0.0.1:8091"
#degrade current not support #degrade current not support

2
spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/file.conf
Unescape Escape View File

@ -28,7 +28,7 @@ transport {
} }
service { service {
#vgroup->rgroup #vgroup->rgroup
vgroup_mapping.order-service-fescar-service-group = "default" vgroup_mapping.order-service-seata-service-group = "default"
#only support single node #only support single node
default.grouplist = "127.0.0.1:8091" default.grouplist = "127.0.0.1:8091"
#degrade current not support #degrade current not support

2
spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/file.conf
Unescape Escape View File

@ -28,7 +28,7 @@ transport {
} }
service { service {
#vgroup->rgroup #vgroup->rgroup
vgroup_mapping.storage-service-fescar-service-group = "default" vgroup_mapping.storage-service-seata-service-group = "default"
#only support single node #only support single node
default.grouplist = "127.0.0.1:8091" default.grouplist = "127.0.0.1:8091"
#degrade current not support #degrade current not support

2
spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java
Unescape Escape View File

@ -51,7 +51,7 @@ public class GlobalTransactionAutoConfiguration {
String txServiceGroup = seataProperties.getTxServiceGroup(); String txServiceGroup = seataProperties.getTxServiceGroup();
if (StringUtils.isEmpty(txServiceGroup)) { if (StringUtils.isEmpty(txServiceGroup)) {
txServiceGroup = applicationName + "-fescar-service-group"; txServiceGroup = applicationName + "-seata-service-group";
seataProperties.setTxServiceGroup(txServiceGroup); seataProperties.setTxServiceGroup(txServiceGroup);
} }

4
spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/SeataProperties.java
Unescape Escape View File

@ -24,10 +24,10 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties("spring.cloud.alibaba.seata") @ConfigurationProperties("spring.cloud.alibaba.seata")
public class SeataProperties { public class SeataProperties {
// todo support config Fescar server information // todo support config Seata server information
/** /**
* Seata tx service group.default is ${spring.application.name}-fescar-service-group. * Seata tx service group.default is ${spring.application.name}-seata-service-group.
*/ */
private String txServiceGroup; private String txServiceGroup;

6
spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClient.java
Unescape Escape View File

@ -68,9 +68,9 @@ public class SeataFeignClient implements Client {
Map<String, Collection<String>> headers = new HashMap<>(MAP_SIZE); Map<String, Collection<String>> headers = new HashMap<>(MAP_SIZE);
headers.putAll(request.headers()); headers.putAll(request.headers());
List<String> fescarXid = new ArrayList<>(); List<String> seataXid = new ArrayList<>();
fescarXid.add(xid); seataXid.add(xid);
headers.put(RootContext.KEY_XID, fescarXid); headers.put(RootContext.KEY_XID, seataXid);
return Request.create(request.method(), request.url(), headers, request.body(), return Request.create(request.method(), request.url(), headers, request.body(),
request.charset()); request.charset());

6
spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataLoadBalancerFeignClient.java
Unescape Escape View File

@ -71,9 +71,9 @@ public class SeataLoadBalancerFeignClient extends LoadBalancerFeignClient {
Map<String, Collection<String>> headers = new HashMap<>(MAP_SIZE); Map<String, Collection<String>> headers = new HashMap<>(MAP_SIZE);
headers.putAll(request.headers()); headers.putAll(request.headers());
List<String> fescarXid = new ArrayList<>(); List<String> seataXid = new ArrayList<>();
fescarXid.add(xid); seataXid.add(xid);
headers.put(RootContext.KEY_XID, fescarXid); headers.put(RootContext.KEY_XID, seataXid);
return Request.create(request.method(), request.url(), headers, request.body(), return Request.create(request.method(), request.url(), headers, request.body(),
request.charset()); request.charset());

Write Preview
Loading…
Cancel
Save