From 9d64b9d589775ee0d53fa89305d7972064714022 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Wed, 20 Nov 2019 17:48:40 +0800 Subject: [PATCH] =?UTF-8?q?optimize=20the=20shell=20to=20check=20the=20exi?= =?UTF-8?q?st=20process;=20use:=20valueObj.getJSONObject("bytes").getStrin?= =?UTF-8?q?g("value");in=20the=20ClientResolveUtil.java=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/scripts/startup.sh | 12 +++++++++++- .../src/main/resources/scripts/manager-startup.sh | 12 +++++++++++- .../src/main/resources/scripts/peer-startup.sh | 12 +++++++++++- .../blockchain/sdk/converters/ClientResolveUtil.java | 4 ++-- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/source/deployment/deployment-gateway/src/main/resources/scripts/startup.sh b/source/deployment/deployment-gateway/src/main/resources/scripts/startup.sh index 915c33f3..62272d19 100644 --- a/source/deployment/deployment-gateway/src/main/resources/scripts/startup.sh +++ b/source/deployment/deployment-gateway/src/main/resources/scripts/startup.sh @@ -2,8 +2,18 @@ HOME=$(cd `dirname $0`;cd ../; pwd) GATEWAY=$(ls $HOME/lib | grep deployment-gateway-) +PROC_INFO=$HOME/lib/$GATEWAY" -c "$HOME/config/gateway.conf +#echo $PROC_INFO +#get PID +PID=`ps -ef | grep "$PROC_INFO" | grep -v grep | awk '{print $2}'` +#echo $PID +if [[ ! -z $PID ]] +then + echo "process already exists,please check... If necessary, you should kill the process first." + exit +fi if [ ! -n "$GATEWAY" ]; then echo "GateWay Is Null !!!" else - nohup java -jar -server -Djdchain.log=$HOME $HOME/lib/$GATEWAY -c $HOME/config/gateway.conf $* >$HOME/bin/gw.out 2>&1 & + nohup java -jar -server -Djdchain.log=$HOME $PROC_INFO $* >$HOME/bin/gw.out 2>&1 & fi \ No newline at end of file diff --git a/source/deployment/deployment-peer/src/main/resources/scripts/manager-startup.sh b/source/deployment/deployment-peer/src/main/resources/scripts/manager-startup.sh index 790dfdfd..e630da5f 100644 --- a/source/deployment/deployment-peer/src/main/resources/scripts/manager-startup.sh +++ b/source/deployment/deployment-peer/src/main/resources/scripts/manager-startup.sh @@ -2,8 +2,18 @@ HOME=$(cd `dirname $0`;cd ../; pwd) UMP=$(ls $HOME/manager | grep manager-booter-) +PROC_INFO=$HOME/manager/$UMP" -home "$HOME" -p 8000" +#echo $PROC_INFO +#get PID +PID=`ps -ef | grep "$PROC_INFO" | grep -v grep | awk '{print $2}'` +#echo $PID +if [[ ! -z $PID ]] +then + echo "process already exists,please check... If necessary, you should kill the process first." + exit +fi if [ ! -n "UMP" ]; then echo "JDChain Manager Is Null !!!" else - nohup java -jar -server -Djdchain.log=$HOME $HOME/manager/$UMP -home $HOME -p 8000 $* >$HOME/bin/jump.out 2>&1 & + nohup java -jar -server -Djdchain.log=$HOME $PROC_INFO $* >$HOME/bin/jump.out 2>&1 & fi \ No newline at end of file diff --git a/source/deployment/deployment-peer/src/main/resources/scripts/peer-startup.sh b/source/deployment/deployment-peer/src/main/resources/scripts/peer-startup.sh index bbdf3aa7..407b30ea 100644 --- a/source/deployment/deployment-peer/src/main/resources/scripts/peer-startup.sh +++ b/source/deployment/deployment-peer/src/main/resources/scripts/peer-startup.sh @@ -2,8 +2,18 @@ HOME=$(cd `dirname $0`;cd ../; pwd) PEER=$(ls $HOME/system | grep deployment-peer-) +PROC_INFO=$HOME/system/$PEER" -home="$HOME" -c "$HOME/config/ledger-binding.conf" -p 7080" +#echo $PROC_INFO +#get PID +PID=`ps -ef | grep "$PROC_INFO" | grep -v grep | awk '{print $2}'` +#echo $PID +if [[ ! -z $PID ]] +then + echo "process already exists,please check... If necessary, you should kill the process first." + exit +fi if [ ! -n "$PEER" ]; then echo "Peer Is Null !!!" else - nohup java -jar -server -Xmx2g -Xms2g -Djdchain.log=$HOME $HOME/system/$PEER -home=$HOME -c $HOME/config/ledger-binding.conf -p 7080 $* >$HOME/bin/peer.out 2>&1 & + nohup java -jar -server -Xmx1g -Xms1g -Djdchain.log=$HOME $PROC_INFO $* >$HOME/bin/peer.out 2>&1 & fi \ No newline at end of file diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java index 4e7534a4..46bb8d12 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java @@ -147,8 +147,8 @@ public class ClientResolveUtil { long expectedVersion = currWriteSetObj.getLong("expectedVersion"); JSONObject valueObj = currWriteSetObj.getJSONObject("value"); String typeStr = valueObj.getString("type"); - // Base58Utils.decode(valueObj.getJSONObject("value").getString("value")) - String realValBase58 = valueObj.getJSONObject("value").getString("value"); + // Base58Utils.decode(valueObj.getJSONObject("bytes").getString("value")) + String realValBase58 = valueObj.getJSONObject("bytes").getString("value"); String key = currWriteSetObj.getString("key"); DataType dataType = DataType.valueOf(typeStr); BytesValue bytesValue = TypedValue.fromType(dataType, Base58Utils.decode(realValBase58));