update the readme doc (#5)

* update the readme doc * update the stomp sample * format readme doc * update the stomp sample * fix the is connected value in the stomp sample * remove the dist/conf * update the web3sdkutil main * update the sleep time
WeBankBlockchain · Apr 23, 2019 · 15dc4bb · 15dc4bb
1 parent cf0cbe3
commit 15dc4bb
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 218 deletions.
diff --git a/README.md b/README.md
@@ -13,12 +13,14 @@ WeEvent由微众银行自主研发并完全开源，秉承分布式商业模式
 
 ### 快速入门
 - 安装前置依赖
-    区块链是`WeEvent`的前置依赖，用户需要提前安装，具体操作见[FISCO-BCOS文档](https://fisco-bcos-documentation.readthedocs.io/zh_CN/release-1.3/docs/tools/index.html)。
 
+    在体验WeEvent之前，用户需提前搭建好区块链，WeEvent现已支持FISCO BCOS区块链底层平台，具体操作见[FISCO-BCOS文档](https://fisco-bcos-documentation.readthedocs.io/zh_CN/release-1.3/docs/tools/index.html)。
 - 搭建服务
+
     快速搭建一套`WeEvent`服务，请参考[文档](https://weeventdoc.readthedocs.io/zh_CN/latest/install/quickinstall.html)。通过一键部署的`WeEvent`服务，用户可以快速体验和开发。
 
 - 体验订阅
+
     参见[更多代码样例](https://github.com/WeBankFinTech/WeEvent/tree/master/src/test/java/com/webank/weevent/sample)。
 
 

diff --git a/dist/broker.sh b/dist/broker.sh
@@ -20,15 +20,15 @@ start(){
         echo "broker is running, (PID=$currentbroker_pid)"
     else
         nohup java ${JAVA_OPTS} -Xbootclasspath/a:./conf -jar ./apps/*  >/dev/null 2>&1 &
-        sleep 1
+        sleep 3
         eventbroker_pid=$!
         if [ -n "$eventbroker_pid" ];then
             echo "start broker success (PID=$eventbroker_pid)"
             if [ -f $brokerpid_path ]; then 
                  echo "${eventbroker_pid}" >$brokerpid_path
             else
                  touch $brokerpid_path;
-                 sleep 1
+                 sleep 3
                  echo "${eventbroker_pid}" >$brokerpid_path
             fi
 

diff --git a/dist/conf/application-dev.properties b/dist/conf/application-dev.properties
diff --git a/dist/conf/application-prod.properties b/dist/conf/application-prod.properties
diff --git a/dist/conf/application.properties b/dist/conf/application.properties
diff --git a/dist/conf/applicationContext.xml b/dist/conf/applicationContext.xml
diff --git a/dist/conf/banner.txt b/dist/conf/banner.txt
diff --git a/dist/conf/ca.crt b/dist/conf/ca.crt
diff --git a/dist/conf/client.keystore b/dist/conf/client.keystore
diff --git a/dist/conf/log4j.properties b/dist/conf/log4j.properties
diff --git a/dist/conf/log4j2.xml b/dist/conf/log4j2.xml
diff --git a/dist/conf/server.p12 b/dist/conf/server.p12
diff --git a/src/main/java/com/webank/weevent/broker/fisco/util/Web3sdkUtils.java b/src/main/java/com/webank/weevent/broker/fisco/util/Web3sdkUtils.java
@@ -205,6 +205,7 @@ public static void main(String[] args) {
             }
         } catch (Exception e) {
             e.printStackTrace();
+            System.exit(1);
         }
 
         // web3sdk can't exit gracefully

diff --git a/src/test/java/com/webank/weevent/sample/Stomp.java b/src/test/java/com/webank/weevent/sample/Stomp.java
@@ -89,9 +89,9 @@ public void handleException(StompSession session, StompCommand command, StompHea
 
             @Override
             public void handleTransportError(StompSession session, Throwable exception) {
-                if (exception instanceof ConnectionLostException) {
+                if (exception instanceof ConnectionLostException||!isConnected) {
                     log.info("connection closed, {}", session.getSessionId());
-
+                    isConnected=false;
                     // do auto reconnect in this handle
                     while (!isConnected) try {
                         // retry every 3 seconds