From 2b12c10e2f49a31794fb9d393221d969c512b138 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 26 Jul 2021 11:35:55 +0800
Subject: [PATCH 1/2] update shell of grep port

---
 WeBASE-Data-Collect/start.sh  | 2 +-
 WeBASE-Data-Collect/status.sh | 2 +-
 WeBASE-Data-Collect/stop.sh   | 2 +-
 WeBASE-Data-Fetcher/start.sh  | 2 +-
 WeBASE-Data-Fetcher/status.sh | 2 +-
 WeBASE-Data-Fetcher/stop.sh   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WeBASE-Data-Collect/start.sh b/WeBASE-Data-Collect/start.sh
index 5b97216..b764db5 100644
--- 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
index e96acff..994ee3b 100644
--- 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
index 8969195..a7a0a5a 100644
--- 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
index fcedf24..d494d93 100644
--- 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
index 6ec0f9c..37cf431 100644
--- 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
index fd9033e..0c49eb0 100644
--- 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

From fdfd764335e3e0d1444f1f2a526e7e940b1361e3 Mon Sep 17 00:00:00 2001
From: marsli <847701726@qq.com>
Date: Fri, 4 Mar 2022 16:40:48 +0800
Subject: [PATCH 2/2] update front version limit

---
 WeBASE-Data-Collect/Changelog.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WeBASE-Data-Collect/Changelog.md b/WeBASE-Data-Collect/Changelog.md
index 470f8cb..359ecec 100644
--- 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/)