Merge branch 'master' into develop

# Conflicts:
#	data-explorer/pom.xml
#	manager-explorer/pom.xml
#	pom.xml

data-explorer/server/routes/ledgers.js

@@ -605,96 +605,7 @@ router.get('/:ledger/txs/hash/:tx_hash', function(req, res) {
   let params = req.body,
     ret = {};
 
-  Object.assign(ret, resultData,{
-    "data": {
-      "blockHeight": 1,
-      "executionState": "SUCCESS",
-      "transactionContent": {
-        "ledgerHash": {
-          "value": "657TQAw6ssVoeKniWGwbovk7njvCTvikPambM9eBv6ezs"
-        },
-        "operations": [
-          {
-            "userID": {
-              "address": {
-                "value": "5SmBgzsrnY6u9Y7DgSSkXfTkCgp83hiFin3v"
-              },
-              "pubKey": {
-                "value": "mb5kukaqjWtXyAerfHU1JDtVwabSeBU5c3khMZbNh7R8VJ"
-              }
-            }
-          },
-          {
-            "accountID": {
-              "address": {
-                "value": "5SmA98VknTbZ1Z7fmbNPHBuN2pbD89ogy8Ha"
-              },
-              "pubKey": {
-                "value": "mbC8hzmYBz2SsLLqwoBXAJiGeHrCnByBEvcaUZWscAiPqR"
-              }
-            }
-          },
-          {
-            "contractID": {
-              "address": {
-                "value": "5SmA98VknTbZ1Z7fmbNPHBuN2pbD89ogy8Ha"
-              },
-              "pubKey": {
-                "value": "mbC8hzmYBz2SsLLqwoBXAJiGeHrCnByBEvcaUZWscAiPqR"
-              }
-            },
-            "chainCode": "----------"
-          },
-          {
-            "contractAddress": {
-              "value": "mbC8hzmYBz2SsLLqwoBXAJiGeHrCnByBEvcaUZWscAiPqR"
-            },
-            "event": "----------",
-            "args": "----------"
-          },
-          {
-            "writeSet": [{
-              "key": "jdchain",
-              "value": {
-                "type": "TEXT",
-                "value": {
-                  "value": "----------"
-                }
-              },
-              "expectedVersion": 0
-            }],
-            "accountAddress": {
-              "value": "mbC8hzmYBz2SsLLqwoBXAJiGeHrCnByBEvcaUZWscAiPqR"
-            }
-          }
-        ],
-        "hash": {
-          "value": "6BLtM1agb7ERKoN5AJgZKiTjzdS7BpjgzQNYK8ZeDqotA"
-        }
-      },
-      "endpointSignatures": [
-        {
-          "digest": {
-            "value": "42pbfM5YKnf39Gitr4UsjTCzhhnJjwNyi8MnLFYgP4VKewTLzHitzArHEMrCt3hZYUe5ex9XvqtmiCoWpeAbdc31F"
-          },
-          "pubKey": {
-            "value": "mb5kbwzACnhK9P1dVxgMPB2ySJLFyJKQbHpH7T9oRK3LpS"
-          }
-        }
-      ],
-      "nodeSignatures": [
-        {
-          "digest": {
-            "value": "66SQ95SbDaApAJhN2NsFx5sfAQTxsWhMW26D5iPqXc1jZU9rJEhRnqT1nzt62ZAcCvsfrjEsay3MxqXYA5tWPoA2U"
-          },
-          "pubKey": {
-            "value": "mb5kbwzACnhK9P1dVxgMPB2ySJLFyJKQbHpH7T9oRK3LpS"
-          }
-        }
-      ]
-    },
-    "success": true
-  });
+  Object.assign(ret, resultData,{"data":{"blockHeight":2,"operationResults":[],"userAccountSetHash":{"value":"j5nyfcUoZ1YgfnQCV5U6iHQZPQ4aqCp5sx1Vf9UPqiBc56"},"executionState":"SUCCESS","transactionContent":{"ledgerHash":{"value":"j5s3Xx2djijUi7NewerfPtRTta3EAa9ErNcBsHgzkDND7g"},"operations":[{"accountID":{"address":{"value":"LdeNkb56uxHjqz4HJaDGtbGqaHd2D73nz5dGo"},"pubKey":{"value":"7VeR9CqbpKb6EnWrobskY8JBTh5ZS3MjhLFgw8cp6ZBntJa6"}}},{"writeSet":[{"expectedVersion":-1,"value":{"bytes":{"value":"21x71Vecp"},"type":"TEXT"},"key":"key1"}],"accountAddress":{"value":"LdeNkb56uxHjqz4HJaDGtbGqaHd2D73nz5dGo"}}],"hash":{"value":"j5gTM121tKdm3GTC6ET2XDr2aKivDEM5Tp9XFWsxKPxLxG"},"timestamp":1583142977001},"endpointSignatures":[{"digest":{"value":"SMHunDZXh7GUUUmdCwL1RybD2QD9wxDmCuF6Xy7up7Acv8NTi2X9QwuSdMgbGtuvXXMssXreTZZvygxMTkaGxtSTjg"},"pubKey":{"value":"7VeRPKizLbSmqNEBF6VsJEgwN84pEk1WZck5pLgL5N2E7xhJ"}}],"adminAccountHash":{"value":"j5t6rn6W4b89CymyvYbXyx8MtLN7RCvPd94C53BeYaqPJa"},"dataAccountSetHash":{"value":"j5gtK7Q4WMNbu47EucgELFNBvZxQZMuDnmVejCf5QSg2C9"},"nodeSignatures":[{"digest":{"value":"SMHunDZXh7GUUUmdCwL1RybD2QD9wxDmCuF6Xy7up7Acv8NTi2X9QwuSdMgbGtuvXXMssXreTZZvygxMTkaGxtSTjg"},"pubKey":{"value":"7VeRPKizLbSmqNEBF6VsJEgwN84pEk1WZck5pLgL5N2E7xhJ"}}]},"success":true});
 
   res.send(ret);
 });

data-explorer/src/web/components/transactionInfo/transactionInfo.t.html

@@ -49,7 +49,7 @@
               </fj-Row>
               <#each {{this.writeSet}}>
                 <BlockCollapseSmall  title="键：{{this.key}}">
-                  值：{{formatData(this.value.type,this.value.bytes||this.value.bytes.value)}}<br>
+                  值：{{formatData(this.value.type,this.value.bytes)}}<br>
                   预期版本：{{this.expectedVersion}}<br>
                   类型：{{this.value.type}}
                 </BlockCollapseSmall>

data-explorer/webpack.config.js

@@ -10,7 +10,7 @@
 const isProd = process.env.NODE_ENV == 'production';
 const isTest = process.env.NODE_ENV == 'test';
 const isLocal = process.env.Project == 'local';
-const isSelf  = true;// true使用代理服务，false不使用
+const isSelf  = false;// true使用代理服务，false不使用
 const pxToRem = require('postcss-pxtorem');
 const VERSION = '20190101';
 const modifyVars = Object.assign({});
@@ -228,11 +228,11 @@ module.exports = {
     proxy: [
       {
         context: ['/ledgers'],
-        target: 'http://localhost:18081',
+        target: 'http://jdchain-cloud4-8080.jdfmgt.com',
       },
       {
         context: ['/schema',],
-        target: 'http://localhost:18081',
+        target: 'http://jdchain-cloud4-8080.jdfmgt.com',
       }
     ],
   }

manager-explorer/src/main/java/com/jd/blockchain/UmpExplorer.java

-package com.jd.blockchain;
-
-/**
- * 该项目用于管理工具的浏览器界面显示
- * @author shaozhuguang, wangzhe
- * @date 2019-07
- *
- */
-public class UmpExplorer {
-
-    public static void main(String[] args) {
-        System.out.println("This is UMP Project !!!");
-    }
-}