This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-js.git
The following commit(s) were added to refs/heads/master by this push:
new bc8572c add docker-compose.yaml, add zookeeper cluster
new 795f094 Merge pull request #115 from hufeng/master
bc8572c is described below
commit bc8572c6cd303bcd57fa98a9ce9a41c1b676d6c0
Author: hufeng <[email protected]>
AuthorDate: Fri May 24 17:10:28 2019 +0800
add docker-compose.yaml, add zookeeper cluster
---
.vscode/settings.json | 3 +++
README.md | 27 ++++++++++++++++---
docker-compose.yml | 31 ++++++++++++++++++++++
examples/hello-egg/app/dubbo/index.ts | 2 +-
examples/hello-koa/dubbo/dubbo-es6.js | 2 +-
examples/hello-koa/dubbo/dubbo.js | 2 +-
.../META-INF/spring/dubbo-demo-provider.xml | 2 +-
7 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..385f27a
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "java.configuration.updateBuildConfiguration": "interactive"
+}
diff --git a/README.md b/README.md
index b526a17..f82deca 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ With core module
[js-to-java](https://github.com/node-modules/js-to-java), and [
9. Typescript type definition
-10. Convert java dubbo interface to typescript module by interpret tools
+10. Convert java dubbo inter face to typescript module by interpret tools
11. SocketWorker was disconnected auto retry
@@ -184,7 +184,7 @@ const errorProvider = ErrorProvider(dubbo);
({res, err} = await demoProvider.echo());
//print {err: null, res: 'pang'}
({res, err} = await demoProvider.getUserInfo());
- //print {status: 'ok', info: { id: '1', name: 'test' }}
+ //print {err: null, res: {status: 'ok', info: { id: '1', name: 'test' }}
})();
```
@@ -196,10 +196,10 @@ const errorProvider = ErrorProvider(dubbo);
brew install zookeeper
brew services start zookeeper
-#Run test example in java/dubbo-demo-provider
+# Run test example in java/dubbo-demo-provider
yarn run test
-#Full link log tracking
+# Full link log tracking
DEBUG=dubbo* yarn run test
```
@@ -644,3 +644,22 @@ import {Dubbo} from 'dubbo2.js/es6';
---
[Click here!](https://github.com/hufeng/iThink/tree/master/talk)
+
+# How to run example
+
+```sh
+# start zookeeper cluster
+docker-compose up
+
+# start java
+cd java/dubbo-demo/dubbo-demo-provider
+mvn clean package
+java -jar target/dubbo-demo-provider-2.6.3-jar-with-dependencies.jar
+
+# start node
+cd example/hello-koa
+DEBUG=dubbo* node server.js
+
+# request /hello
+curl http://localhost:3000/hello
+```
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..2b64528
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,31 @@
+version: '2'
+services:
+ zoo1:
+ image: zookeeper
+ restart: always
+ container_name: zoo1
+ ports:
+ - '2181:2181'
+ environment:
+ ZOO_MY_ID: 1
+ ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888
server.3=zoo3:2888:3888
+
+ zoo2:
+ image: zookeeper
+ restart: always
+ container_name: zoo2
+ ports:
+ - '2182:2181'
+ environment:
+ ZOO_MY_ID: 2
+ ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888
server.3=zoo3:2888:3888
+
+ zoo3:
+ image: zookeeper
+ restart: always
+ container_name: zoo3
+ ports:
+ - '2183:2181'
+ environment:
+ ZOO_MY_ID: 3
+ ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888
server.3=zoo3:2888:3888
diff --git a/examples/hello-egg/app/dubbo/index.ts
b/examples/hello-egg/app/dubbo/index.ts
index 3b2d679..b2e8da4 100644
--- a/examples/hello-egg/app/dubbo/index.ts
+++ b/examples/hello-egg/app/dubbo/index.ts
@@ -23,7 +23,7 @@ export default (app: EggApplication) => {
const dubbo = new Dubbo<typeof service>({
application: {name: 'node-egg-bff'},
- register: 'localhost:2181',
+ register: 'localhost:2181,localhost:2182,localhost:2183',
service,
dubboSetting,
});
diff --git a/examples/hello-koa/dubbo/dubbo-es6.js
b/examples/hello-koa/dubbo/dubbo-es6.js
index 26d3c89..0f35647 100644
--- a/examples/hello-koa/dubbo/dubbo-es6.js
+++ b/examples/hello-koa/dubbo/dubbo-es6.js
@@ -15,7 +15,7 @@ const dubboSetting = setting
const dubbo = (module.exports = new Dubbo({
application: {name: 'dubbo-node-consumer1'},
- register: 'localhost:2181',
+ register: 'localhost:2181,localhost:2182,localhost:2183',
service,
dubboSetting,
}));
diff --git a/examples/hello-koa/dubbo/dubbo.js
b/examples/hello-koa/dubbo/dubbo.js
index a57aec9..3ecd539 100644
--- a/examples/hello-koa/dubbo/dubbo.js
+++ b/examples/hello-koa/dubbo/dubbo.js
@@ -15,7 +15,7 @@ const dubboSetting = setting
const dubbo = (module.exports = new Dubbo({
application: {name: 'dubbo-node-consumer'},
- register: 'localhost:2181',
+ register: 'localhost:2181,localhost:2182,localhost:2183',
service,
dubboSetting,
}));
diff --git
a/java/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
b/java/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
index 59c1a8f..16bd13f 100644
---
a/java/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
+++
b/java/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml
@@ -23,7 +23,7 @@
<!-- 提供方应用信息，用于计算依赖关系 -->
<dubbo:application name="demo-provider"/>
- <dubbo:registry protocol="zookeeper" address="127.0.0.1:2181"/>
+ <dubbo:registry protocol="zookeeper"
address="127.0.0.1:2181,127.0.0.1:2182,127.0.0.1:2183"/>
<dubbo:provider timeout="1500"/>
