Browse Source

optimize the shell to check the exist process;

use: valueObj.getJSONObject("bytes").getString("value");in the ClientResolveUtil.java。
tags/1.1.2^2
zhaoguangwei 4 years ago
parent
commit
9d64b9d589
4 changed files with 35 additions and 5 deletions
  1. +11
    -1
      source/deployment/deployment-gateway/src/main/resources/scripts/startup.sh
  2. +11
    -1
      source/deployment/deployment-peer/src/main/resources/scripts/manager-startup.sh
  3. +11
    -1
      source/deployment/deployment-peer/src/main/resources/scripts/peer-startup.sh
  4. +2
    -2
      source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java

+ 11
- 1
source/deployment/deployment-gateway/src/main/resources/scripts/startup.sh View File

@@ -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

+ 11
- 1
source/deployment/deployment-peer/src/main/resources/scripts/manager-startup.sh View File

@@ -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

+ 11
- 1
source/deployment/deployment-peer/src/main/resources/scripts/peer-startup.sh View File

@@ -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

+ 2
- 2
source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java View File

@@ -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));


Loading…
Cancel
Save