add english commont and add rabbit compose
diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/rabbit/RabbitChannelAutoConfiguration.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/rabbit/RabbitChannelAutoConfiguration.java
index b184304..e488675 100644
--- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/rabbit/RabbitChannelAutoConfiguration.java
+++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/rabbit/RabbitChannelAutoConfiguration.java
@@ -45,20 +45,12 @@
@ConditionalOnMissingBean()
public RabbitMessagePublisher rabbitMessagePublisher(BindingServiceProperties bindingServiceProperties, RabbitMessageChannel producerMessage) {
Map<String, BindingProperties> bindings = bindingServiceProperties.getBindings();
- // 分区数量,现在现在生产者与消费这都在alpha-server，所以rabbit的分区partitionCount与该数量保持一直
+ // partitionCount must consistent with alpha server because of alpha server contains the consumer
int partitionCount = bindings.get(RabbitMessageChannel.SERVICE_COMB_PACK_PRODUCER).getProducer().getPartitionCount();
RabbitMessagePublisher messagePublisher = new RabbitMessagePublisher(partitionCount, producerMessage);
return messagePublisher;
}
-// @StreamMessageConverter
-// public MessageConverter StreamMessageConverter() {
-// MappingJackson2MessageConverter mappingJackson2HttpMessageConverter = new MappingJackson2MessageConverter();
-//// ObjectMapper objectMapper = new ObjectMapper();
-//// mappingJackson2HttpMessageConverter.setObjectMapper(objectMapper);
-// return mappingJackson2HttpMessageConverter;
-// }
-
@Bean
RabbitSagaEventConsumer sagaEventRabbitConsumer(ActorSystem actorSystem,
@Qualifier("sagaShardRegionActor") ActorRef sagaShardRegionActor,
diff --git a/demo/saga-dubbo-demo/docker-compose.rabbit.yaml b/demo/saga-dubbo-demo/docker-compose.rabbit.yaml
new file mode 100644
index 0000000..d23ff06
--- /dev/null
+++ b/demo/saga-dubbo-demo/docker-compose.rabbit.yaml
@@ -0,0 +1,137 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+##
+#you need to add mysql drive to alpha pom.xml and saga-dubbo-demo pom.xml first
+##
+version: '3.0'
+
+services:
+
+ rabbit:
+ image: "rabbitmq:management"
+ hostname: rabbitmq
+ ports:
+ - "4369:4369"
+ - "5671:5671"
+ - "25672:25672"
+ - "5672:5672"
+ - "15672:15672"
+ environment:
+ RABBITMQ_DEFAULT_USER: servicecomb-pack
+ RABBITMQ_DEFAULT_PASS: H123213PWD
+ networks:
+ -rabbit
+ volumes:
+ - ./rabbitmq.sh:/home/rabbitmq.sh
+
+
+ database:
+ mage: "mysql/mysql-server:5.7"
+ hostname: mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=password
+ - MYSQL_DATABASE=saga
+ - MYSQL_USER=saga
+ - MYSQL_PASSWORD=password
+
+ alpha:
+ image: "alpha-server:${TAG}"
+ hostname: alpha-server
+ ports:
+ - "8081:8080"
+ - "8091:8090"
+ links:
+ - "database:mysql.servicecomb.io"
+ environment:
+ - JAVA_OPTS=-Dspring.profiles.active=mysql
+ - WAIT_FOR_SERVICES=mysql.servicecomb.io:3306:150
+ depends_on:
+ - database
+
+ servicea:
+ image: "servicea:${TAG}"
+ hostname: servicea
+ links:
+ - "alpha:alpha-server.servicecomb.io"
+ - "database:mysql.servicecomb.io"
+ environment:
+ - JAVA_OPTS= -Dspring.profiles.active=mysql
+ -Dspring.datasource.url=jdbc:mysql://mysql.servicecomb.io:3306/saga
+ -Dspring.datasource.username=saga
+ -Dspring.datasource.password=password
+ -Dzookeeper.url=zookeeper.servicecomb.io:2181
+ -Dserver.port=8071
+ -Dalpha.cluster.address=alpha-server.servicecomb.io:8080
+ -Dspring.datasource.initialization-mode=always
+ -Dspring.cloud.stream.instance-index=0
+ - WAIT_FOR_SERVICES=mysql.servicecomb.io:3306:150,zookeeper.servicecomb.io:2181:150,alpha-server.servicecomb.io:8080:150
+ ports:
+ - "8071:8071"
+ depends_on:
+ - database
+ - zookeeper
+ - alpha
+
+ serviceb:
+ image: "serviceb:${TAG}"
+ hostname: serviceb
+ links:
+ - "alpha:alpha-server.servicecomb.io"
+ - "database:mysql.servicecomb.io"
+ environment:
+ - JAVA_OPTS= -Dspring.profiles.active=mysql
+ -Dspring.datasource.url=jdbc:mysql://mysql.servicecomb.io:3306/saga
+ -Dspring.datasource.username=saga
+ -Dspring.datasource.password=password
+ -Dzookeeper.url=zookeeper.servicecomb.io:2181
+ -Dserver.port=8072
+ -Dalpha.cluster.address=alpha-server.servicecomb.io:8080
+ -Dspring.datasource.initialization-mode=always
+ -Dspring.cloud.stream.instance-index=1
+ - WAIT_FOR_SERVICES=mysql.servicecomb.io:3306:150,zookeeper.servicecomb.io:2181:150,alpha-server.servicecomb.io:8080:150
+ ports:
+ - "8072:8072"
+ depends_on:
+ - database
+ - zookeeper
+ - alpha
+
+ servicec:
+ image: "servicec:${TAG}"
+ hostname: servicec
+ links:
+ - "alpha:alpha-server.servicecomb.io"
+ - "database:mysql.servicecomb.io"
+ environment:
+ - JAVA_OPTS= -Dspring.profiles.active=mysql
+ -Dspring.datasource.url=jdbc:mysql://mysql.servicecomb.io:3306/saga
+ -Dspring.datasource.username=saga
+ -Dspring.datasource.password=password
+ -Dzookeeper.url=zookeeper.servicecomb.io:2181
+ -Dserver.port=8073
+ -Dalpha.cluster.address=alpha-server.servicecomb.io:8080
+ -Dspring.datasource.initialization-mode=always
+ -Dspring.cloud.stream.instance-index=2
+ - WAIT_FOR_SERVICES=mysql.servicecomb.io:3306:150,zookeeper.servicecomb.io:2181:150,alpha-server.servicecomb.io:8080:150
+ ports:
+ - "8073:8073"
+ depends_on:
+ - database
+ - zookeeper
+ - alpha
+
