use: valueObj.getJSONObject("bytes").getString("value");in the ClientResolveUtil.java。tags/1.1.2^2
@@ -2,8 +2,18 @@ | |||||
HOME=$(cd `dirname $0`;cd ../; pwd) | HOME=$(cd `dirname $0`;cd ../; pwd) | ||||
GATEWAY=$(ls $HOME/lib | grep deployment-gateway-) | 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 | if [ ! -n "$GATEWAY" ]; then | ||||
echo "GateWay Is Null !!!" | echo "GateWay Is Null !!!" | ||||
else | 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 | fi |
@@ -2,8 +2,18 @@ | |||||
HOME=$(cd `dirname $0`;cd ../; pwd) | HOME=$(cd `dirname $0`;cd ../; pwd) | ||||
UMP=$(ls $HOME/manager | grep manager-booter-) | 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 | if [ ! -n "UMP" ]; then | ||||
echo "JDChain Manager Is Null !!!" | echo "JDChain Manager Is Null !!!" | ||||
else | 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 | fi |
@@ -2,8 +2,18 @@ | |||||
HOME=$(cd `dirname $0`;cd ../; pwd) | HOME=$(cd `dirname $0`;cd ../; pwd) | ||||
PEER=$(ls $HOME/system | grep deployment-peer-) | 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 | if [ ! -n "$PEER" ]; then | ||||
echo "Peer Is Null !!!" | echo "Peer Is Null !!!" | ||||
else | 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 | fi |
@@ -147,8 +147,8 @@ public class ClientResolveUtil { | |||||
long expectedVersion = currWriteSetObj.getLong("expectedVersion"); | long expectedVersion = currWriteSetObj.getLong("expectedVersion"); | ||||
JSONObject valueObj = currWriteSetObj.getJSONObject("value"); | JSONObject valueObj = currWriteSetObj.getJSONObject("value"); | ||||
String typeStr = valueObj.getString("type"); | 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"); | String key = currWriteSetObj.getString("key"); | ||||
DataType dataType = DataType.valueOf(typeStr); | DataType dataType = DataType.valueOf(typeStr); | ||||
BytesValue bytesValue = TypedValue.fromType(dataType, Base58Utils.decode(realValBase58)); | BytesValue bytesValue = TypedValue.fromType(dataType, Base58Utils.decode(realValBase58)); | ||||