Merge pull request #72 from WeBankBlockchain/dev

fix shell of grep port
WeBankBlockchain · Mar 4, 2022 · a780189 · a780189
2 parents 1c65179 + fdfd764
commit a780189
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/WeBASE-Data-Collect/Changelog.md b/WeBASE-Data-Collect/Changelog.md
@@ -14,7 +14,7 @@
 **兼容性**
 
 - 支持FISCO-BCOS 2.4.0或以上版本
-- WeBASE-Front 1.4.0或以上版本
+- WeBASE-Front 1.4.0 - 1.4.3版本
 
 详细了解,请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/latest/)
 
@@ -33,7 +33,7 @@
 **兼容性**
 
 - 支持FISCO-BCOS 2.3.0或以上版本
-- WeBASE-Front 1.3.0或以上版本
+- WeBASE-Front 1.3.0 - 1.4.3版本
 
 详细了解,请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/latest/)
 
diff --git a/WeBASE-Data-Collect/start.sh b/WeBASE-Data-Collect/start.sh
@@ -6,7 +6,7 @@ CURRENT_DIR=$(pwd)/
 LOG_DIR=${CURRENT_DIR}log
 CONF_DIR=${CURRENT_DIR}conf
 
-SERVER_PORT=$(cat $CONF_DIR/application.yml| grep "port" | awk '{print $2}'| sed 's/\r//')
+SERVER_PORT=$(cat $CONF_DIR/application.yml | grep "server:" -A 3 | grep "port" | awk '{print $2}'| sed 's/\r//')
 if [ ${SERVER_PORT}"" = "" ];then
     echo "$CONF_DIR/application.yml server port has not been configured"
     exit -1

diff --git a/WeBASE-Data-Collect/status.sh b/WeBASE-Data-Collect/status.sh
@@ -4,7 +4,7 @@ APP_MAIN=com.webank.webase.data.collect.Application
 CURRENT_DIR=$(pwd)/
 CONF_DIR=${CURRENT_DIR}conf
 
-SERVER_PORT=$(cat $CONF_DIR/application.yml| grep "port" | awk '{print $2}'| sed 's/\r//')
+SERVER_PORT=$(cat $CONF_DIR/application.yml | grep "server:" -A 3 | grep "port" | awk '{print $2}'| sed 's/\r//')
 if [ ${SERVER_PORT}"" = "" ];then
     echo "$CONF_DIR/application.yml server port has not been configured"
     exit -1

diff --git a/WeBASE-Data-Collect/stop.sh b/WeBASE-Data-Collect/stop.sh
@@ -4,7 +4,7 @@ APP_MAIN=com.webank.webase.data.collect.Application
 CURRENT_DIR=$(pwd)/
 CONF_DIR=${CURRENT_DIR}conf
 
-SERVER_PORT=$(cat $CONF_DIR/application.yml| grep "port" | awk '{print $2}'| sed 's/\r//')
+SERVER_PORT=$(cat $CONF_DIR/application.yml | grep "server:" -A 3 | grep "port" | awk '{print $2}'| sed 's/\r//')
 if [ ${SERVER_PORT}"" = "" ];then
     echo "$CONF_DIR/application.yml server port has not been configured"
     exit -1

diff --git a/WeBASE-Data-Fetcher/start.sh b/WeBASE-Data-Fetcher/start.sh
@@ -6,7 +6,7 @@ CURRENT_DIR=$(pwd)/
 LOG_DIR=${CURRENT_DIR}log
 CONF_DIR=${CURRENT_DIR}conf
 
-SERVER_PORT=$(cat $CONF_DIR/application.yml| grep "port" | awk '{print $2}'| sed 's/\r//')
+SERVER_PORT=$(cat $CONF_DIR/application.yml | grep "server:" -A 3 | grep "port" | awk '{print $2}'| sed 's/\r//')
 if [ ${SERVER_PORT}"" = "" ];then
     echo "$CONF_DIR/application.yml server port has not been configured"
     exit -1

diff --git a/WeBASE-Data-Fetcher/status.sh b/WeBASE-Data-Fetcher/status.sh
@@ -4,7 +4,7 @@ APP_MAIN=com.webank.webase.data.fetcher.Application
 CURRENT_DIR=$(pwd)/
 CONF_DIR=${CURRENT_DIR}conf
 
-SERVER_PORT=$(cat $CONF_DIR/application.yml| grep "port" | awk '{print $2}'| sed 's/\r//')
+SERVER_PORT=$(cat $CONF_DIR/application.yml | grep "server:" -A 3 | grep "port" | awk '{print $2}'| sed 's/\r//')
 if [ ${SERVER_PORT}"" = "" ];then
     echo "$CONF_DIR/application.yml server port has not been configured"
     exit -1

diff --git a/WeBASE-Data-Fetcher/stop.sh b/WeBASE-Data-Fetcher/stop.sh
@@ -4,7 +4,7 @@ APP_MAIN=com.webank.webase.data.fetcher.Application
 CURRENT_DIR=$(pwd)/
 CONF_DIR=${CURRENT_DIR}conf
 
-SERVER_PORT=$(cat $CONF_DIR/application.yml| grep "port" | awk '{print $2}'| sed 's/\r//')
+SERVER_PORT=$(cat $CONF_DIR/application.yml | grep "server:" -A 3 | grep "port" | awk '{print $2}'| sed 's/\r//')
 if [ ${SERVER_PORT}"" = "" ];then
     echo "$CONF_DIR/application.yml server port has not been configured"
     exit -1