update doip-sdk

update index_datanet
add update node manager
2023-12-15 16:36:54 +08:00 · 2022-12-13 10:39:08 +08:00 · 2022-11-29 15:14:57 +08:00 · 2022-10-25 17:51:02 +08:00 · 2022-09-02 21:26:21 +08:00 · 2022-06-26 17:54:29 +08:00
21 changed files with 3426 additions and 9354 deletions
--- a/NodePortal.html
+++ b/NodePortal.html
@ -67,7 +67,7 @@
    <div class="col-4">
        <a class="navbar-brand" href="#"> <img alt="Brand"
                                               src="./images/logo-1.png" style="height: 30px">
-        </a> <span>数瑞智能合约节点管理中心</span>
+        </a> <span>合约引擎管理中心</span>
    </div>

    <div class="nav navbar-right userName" data-toggle="modal"
@ -230,16 +230,29 @@
                                                            onchange="changeYpkName(this.value)">
                                                        <option selected>请选择ypk文件</option>
                                                    </select>
+                                                    <input class="form-control" id="createParam"
+                                                           placeholder="填写启动参数" class="modal_input"/>
+                                                    <div class="input-group-text">
+                                                        <input type="checkbox" id="autoConvertStr"
+                                                               aria-label="Checkbox for convertParam"
+                                                               data-toggle="tooltip"
+                                                               checked
+                                                               title="" data-original-title="自动将参数转为JSON对象"/>
+                                                    </div>
+
+                                                    <input class="form-control input-group-small"
+                                                           id="remoteDebugPort"
+                                                           placeholder="远程调试端口" class="modal_input"/>
+
                                                    <select id="selectDumpPeriod" class="custom-select"
                                                            style="appearance: none">
-
                                                        <option selected>不保存</option>
-                                                        <option selected>/12hours自动保存</option>
-                                                        <option selected>/1day自动保存</option>
-                                                        <option selected>/2days自动保存</option>
-                                                        <option selected>选择状态保存模式</option>
-
+                                                        <option>/12hours</option>
+                                                        <option>/1day</option>
+                                                        <option>/2days</option>
+                                                        <option>状态保存模式</option>
                                                    </select>
+
                                                    <div class="input-group-append">
                                                        <button onclick="deleteYpk()"
                                                                type="button" title="删除该合约ypk文件" data-toggle="tooltip"
@ -250,9 +263,15 @@
                                                        </button>
                                                    </div>
                                                    <div class="input-group-append">
+                                                        <button type="button" class="btn  btn-outline-primary"
+                                                                title="使用该ypk单点调试启动" data-toggle="tooltip"
+                                                                onclick="startContractAtSlave(true)">
+                                                            <img alt="Brand" src="./images/onlineide/debug.png"
+                                                                 class="buttonimg">
+                                                        </button>
                                                        <button type="button" class="btn  btn-outline-primary"
                                                                title="使用该ypk单点启动合约" data-toggle="tooltip"
-                                                                onclick="startContractAtSlave()">
+                                                                onclick="startContractAtSlave(false)">
                                                            <img alt="Brand" src="./images/onlineide/start.png"
                                                                 class="buttonimg">
                                                        </button>
@ -280,7 +299,10 @@
                                                        <option value="3">RARF</option>
                                                        <option value="4">RARH</option>
                                                        <option value="5">RARA</option>
-                                                        <option value="6">Shading</option>
+                                                        <option value="6">Sharding</option>
+                                                        <option value="7">SASharding</option>
+                                                        <option value="8">PBFT</option>
+                                                        <option value="9">RAFT</option>
                                                    </select>
                                                    <div class="btn-group mr-3" role="group"
                                                         style="margin-left: 2%">
@ -504,7 +526,8 @@
                                                    </div>

                                                    <input type="text" class="form-control" placeholder="输入参数" id="arg">
-                                                    <input type="text" class="form-control col-2" placeholder="输入gas" id="gasLimit">
+                                                    <input type="text" class="form-control col-2" placeholder="输入gas"
+                                                           id="gasLimit">
                                                    <div class="input-group-append">
                                                        <div class="input-group-text">
                                                            <input type="checkbox" id="executeContractAsDebug"
@ -553,7 +576,8 @@
                                                        <span class="input-group-text">参数</span>
                                                    </div>

-                                                    <input type="text" class="form-control" placeholder="输入参数" id="maskArg">
+                                                    <input type="text" class="form-control" placeholder="输入参数"
+                                                           id="maskArg">

                                                    <div class="input-group-append">
                                                        <button onclick="getMask()" type="button"
@ -586,7 +610,8 @@
                                                        <span class="input-group-text">参数</span>
                                                    </div>

-                                                    <input type="text" class="form-control" placeholder="输入参数" id="mockArg">
+                                                    <input type="text" class="form-control" placeholder="输入参数"
+                                                           id="mockArg">

                                                    <div class="input-group-append">
                                                        <button onclick="getMock()" type="button"
@ -1031,9 +1056,9 @@
                                                <div class="input-group mb-3">
                                                    <div class="input-group-prepend">
 															<span class="input-group-text"
-                                                                  id="inputGroup-sizing-default">PeerID</span>
+                                                                  id="inputGroup-sizing-default">节点公钥</span>
                                                    </div>
-                                                    <input type="text" class="form-control" id="peerIDInput">
+                                                    <input type="text" class="form-control" id="nodePubKeyInput">
                                                </div>
                                            </div>
                                            <div class="d-flex justify-content-center">
@ -1050,20 +1075,6 @@
                                                    </div>
                                                </div>
                                            </div>
-                                            <div class="d-flex justify-content-center">
-                                                <div class="input-group mb-3">
-                                                    <div class="input-group-prepend">
-															<span class="input-group-text"
-                                                                  id="inputGroup-sizing-default">MasterAddr</span>
-                                                    </div>
-                                                    <input type="text" class="form-control" id="masterAddrInput">
-                                                    <div class="input-group-append">
-                                                        <button class="btn btn-outline-secondary" type="button"
-                                                                onclick="changeMasterAddress()">修改
-                                                        </button>
-                                                    </div>
-                                                </div>
-                                            </div>
                                            <div class="d-flex justify-content-center">
                                                <div class='input-group mb-3'>
                                                    <div class="input-group-prepend">
@ -1079,6 +1090,22 @@
                                                    </div>
                                                </div>
                                            </div>
+                                            <div class="d-flex justify-content-center">
+                                                <div class='input-group mb-3'>
+                                                    <div class="input-group-prepend">
+															<span class="input-group-text"
+                                                                  id="inputGroup-sizing-default">加入网络WS</span>
+                                                    </div>
+                                                    <input type='text' class='form-control'
+                                                           id='nodeCenterWSInput'>
+                                                    <div class='input-group-append'>
+                                                        <button class='btn btn-outline-secondary' type='button'
+                                                                id='changeNodeCenterWS' onclick='changeNodeCenterWS()'>
+                                                            修改
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                            </div>
                                            <div class="d-flex justify-content-center">
                                                <div class="input-group mb-3">
                                                    <div class="input-group-prepend">
@ -1335,6 +1362,11 @@
    //initWSocket();


+
+
+
+
+
 </script>

 </body>
--- a/NodePortal_Gateway.html
+++ b/NodePortal_Gateway.html
--- a/OnlineIDE.html
+++ b/OnlineIDE.html
@ -2,7 +2,8 @@
 <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
    <meta http-equiv="Cache-Control" content="no-cache"/>
-    <title>数瑞智能合约在线编辑器</title>
+    <meta name="sharedArrayBuffer" description="using cross-origin-isolation in the web browser">
+    <title>智能合约在线编辑器</title>
    <script src="./jqueryui1.12/jquery-2.1.4.js"></script>
    <link href="./jqueryui1.12/jquery-ui.css" rel="stylesheet">
    <script src="./jqueryui1.12/jquery-ui.js"></script>
@ -35,11 +36,6 @@
    <!--script src="./js/echartsTheme.js"></script -->
    <!-- script src="./js/echarts-gl.min.js"></script -->
    <script src="./js/sm2.js"></script>
-    <script src="./js/sm3.js"></script>
-    <script src="./js/sm4.js"></script>
-
-
-    <script src="./js/sm/index.js"></script>
    <script src="./js/d3.v5.min.js"></script>
    <!-- script src="./js/dagre-d3.min.js"></script -->
    <script src="./js/tipsy/jquery.tipsy.min.js"></script>
@ -139,7 +135,7 @@
    <div class="col-4">
        <a class="navbar-brand" href="#"> <img alt="Brand"
                                               src="./images/logo-1.png" style="height: 30px">
-        </a> <span>数瑞智能合约在线编辑器</span><input id="uploadFileInput" type="file"
+        </a> <span>智能合约在线编辑器</span><input id="uploadFileInput" type="file"
                                            name="file" multiple onchange="uploadFile()" style="display: none;">
    </div>
    <div class="nav navbar-right userName" data-toggle="modal"
@ -390,12 +386,35 @@
                    </div>
                    <div class="input-group mb-1">
                        <div class="btn-group btn-block" role="group">
+                            <input class="form-control input-group-small"
+                                   id="createParam"
+                                   placeholder="启动参数" class="modal_input"/>
+                            <div class="input-group-text">
+                                <input type="checkbox" id="autoConvertStr"
+                                       aria-label="Checkbox for convertParam"
+                                       data-toggle="tooltip"
+                                       checked
+                                       title="" data-original-title="自动将参数转为JSON对象"/>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="input-group mb-1">
+                        <div class="btn-group btn-block" role="group">
+                            <input class="form-control input-group-small"
+                                   id="remoteDebugPort"
+                                   placeholder="调试端口" class="modal_input"/>
                            <button class="btn btn-outline-primary"
-                                    onclick="startContractAsDebug()" type="button" id="button-debug"
-                                    title="调试" data-toggle="tooltip">
+                                    onclick="startContractAsDebug(true)" type="button" id="button-debug"
+                                    title="调试启动" data-toggle="tooltip">
                                <img alt="Brand" src="./images/onlineide/debug.png"
                                     class="buttonimg">
                            </button>
+                            <button class="btn btn-outline-primary"
+                                    onclick="startContractAsDebug(false)" type="button" id="button-start"
+                                    title="启动" data-toggle="tooltip">
+                                <img alt="Brand" src="./images/onlineide/start.png"
+                                     class="buttonimg">
+                            </button>
                        </div>
                    </div>
                    <div class="input-group mt-1 mb-3">
--- a/images/bdwarelog.png
+++ b/images/bdwarelog.png
--- a/images/datanet/identifier.png
+++ b/images/datanet/identifier.png
--- a/images/datanet/repo.png
+++ b/images/datanet/repo.png
--- a/images/datanet/search.png
+++ b/images/datanet/search.png
--- a/index_datanet.html
+++ b/index_datanet.html
@ -0,0 +1,314 @@
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="Cache-Control" content="no-cache"/>
+    <title>数瑞数联网系统</title>
+    <script src="./jqueryui1.12/jquery-2.1.4.js"></script>
+    <script src="./js/createWS.js"></script>
+    <script src="./js/cryptico.js"></script>
+    <script src="./js/bootstrap.min.js"></script>
+    <script src="./js/commonutil.js"></script>
+    <script src="./js/vue.js"></script>
+    <script src="./client/js/bdwareclient.js"></script>
+    <script src="./js/sm2.js"></script>
+    <link href="./css/common.css" rel="stylesheet">
+    <link href="./css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="background: #2E324C; color: white;">
+
+<div class="modal fade" id="pubkeyDialog" data-backdrop="static">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="exampleModalLongTitle" style="color:black;">用户信息</h5>
+            </div>
+            <div class="modal-body">
+                <div class="row" style="padding-left: 16px; padding-right: 16px">
+                    <div class="input-group mb-3">
+                        <div class="input-group-prepend">
+                            <label class="input-group-text" for="localKeyList">本地密钥</label>
+                        </div>
+                        <select class="custom-select"
+                                aria-label="Example select with button addon"
+                                style="appearance: none" v-model="selectedSM2Key"
+                                @change="changeSM2Key($event)">
+                            <option v-for="(item,index) in sm2KeyList" :key="index"
+                                    :value='item.id'>{{item.title}}
+                            </option>
+                        </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-outline-primary" for="localKeyList"
+                                    v-on:click="exportPubkey">导出密钥
+                            </button>
+
+
+                            <button type="button" class="btn btn-outline-primary"
+                                    id="generatePubkeyBtn" v-on:click="generatePubkey">生成新密钥
+                            </button>
+
+
+                            <button class="btn btn-outline-danger" for="localKeyList"
+                                    v-on:click="deletePubkey">删除密钥
+                            </button>
+
+                        </div>
+                    </div>
+
+                    <textarea class="form-control mb-3" title="复制密钥，并妥善保存"
+                              id="sm2KeyTextarea" v-model="sm2KeyStr"
+                              style="width: 100%; min-height: 150px; resize:none" rows="" cols="">
+					</textarea>
+                    <div class="row" style="padding-left: 16px; padding-right: 16px">
+                        <div class="input-group mb-1">
+                            <div class="input-group-prepend">
+                                <label class="input-group-text" for="localKeyList">以上为当前SM2密钥，请复制或导出密钥，并妥善保存</label>
+                            </div>
+                            <div class="input-group-append">
+                                <button type="button" class="btn btn-primary"
+                                        data-dismiss="modal" id="importPubkeyBtn"
+                                        v-on:click="importPubkey">确认
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<div style="width: 90%; height:10px; max-width: 1000px; min-width: 850px; margin: 3% auto 0px;">
+    <header class="" style="float:right">
+        <div class=" nav navbar-right userName" data-toggle="modal" id="user"
+             data-target="#pubkeyDialog">当前用户： {{shortName}}
+        </div>
+    </header>
+</div>
+
+<style>
+    .halfDiv {
+    float: left;
+    width: 100%;
+    height: 100%;
+    }
+
+    .projectTreeDiv {
+    height: auto;
+    padding: 0;
+    }
+
+    .halfDivRight {
+    float: left;
+    width: 100%;
+    height: 100%;
+    }
+
+    .ui-tabs {
+    padding: 0;
+    }
+
+    .ui-accordion .ui-accordion-content {
+    padding: 0;
+    }
+
+    #tabs-1 {
+    display: none;
+    }
+
+    .ui-tabs .ui-tabs-panel {
+    padding: 0;
+    }
+
+    .context-menu-root {
+    z-index: 10;
+    }
+
+    #projectDiv {
+    height: 83%;
+    width: 20%;
+    border: 0px solid grey;
+    float: left;
+    }
+
+    .CodeMirror {
+    height: auto
+    }
+
+    .logoimg {
+    width: auto;
+    height: auto;
+    max-width: 100%;
+    max-height: 100%;
+    }
+
+    input {
+    height: 32px;
+    }
+
+    .sendTransInput {
+    background-color: #f0e4e4;
+    border-radius: 5px;
+    margin: 5px;
+    width: 15%;
+    margin-left: 4%;
+    border: 0px;
+    }
+
+    .normalDiv {
+    float: left;
+    text-align: center;
+    border-radius: 5px;
+    margin: 2%;
+    padding: 5px;
+    padding-top: 30px;
+    padding-bottom: 30px;
+    width: 29%;
+    cursor: hand;
+    background: #2E324C;
+    color: white;
+    }
+
+    .iconimg {
+    width: auto;
+    height: auto;
+    max-width: 48px;
+    max-height: 48px;
+    vertical-align: middle;
+    filter: invert(100%);
+    }
+
+
+
+
+
+
+
+
+
+</style>
+<div id="main" style="background: #2E324C; color: white;">
+    <input id="urlInput" style="display:none"/>
+    <input id="selectContract" style="display:none"/>
+    <div
+            style="width: 90%; max-width: 1000px; min-width: 850px; margin: 0 auto; margin-top: 3%;">
+        <div style="width: 20%; float: right; margin-right: 0%">
+            <img src="./images/logo.png" class="logoimg"></img>
+        </div>
+        <div
+                style="width: fit-content; margin: 0; font-size: 200%; background-color: white; color: black; border-radius: 10px; float: left; padding: 10px;">
+            &nbsp;&nbsp;导航&nbsp;&nbsp;
+        </div>
+        <div
+                style="width: 100%; margin-top: 2%; float: left; background-color: white; border-radius: 10px;">
+            <div class="normalDiv" onclick="jumpTo('./DOIP/GlobalRouter/assets/#')">
+                <img src="./images/datanet/identifier.png" class="iconimg"></img><br/>
+                <span style="vertical-align: middle">标识解析系统</span>
+            </div>
+            <div class="normalDiv" onclick="jumpTo('./DOIP/Registry/assets/#')">
+                <img src="./images/datanet/search.png" class="iconimg"></img><br/>
+                <span style="vertical-align: middle">数字对象注册表</span>
+            </div>
+            <div class="normalDiv"
+                 onclick="jumpTo('./client/bdwareclient.html?self=true&contract=RepositoryExample')">
+                <img src="./images/datanet/repo.png" class="iconimg"></img><br/>
+                <span style="vertical-align: middle">数字对象仓库</span>
+            </div>
+
+        </div>
+        <br/>
+        <div style="width: fit-content; margin-top: 2%; float: right; border-radius: 10px; font-size: 50%">
+            Icons made by
+            <a href="https://www.flaticon.com/authors/monkik"
+               title="monkik" style="color: white;">monkik</a>
+            from
+            <a href="https://www.flaticon.com/" title="Flaticon"
+               style="color: white;">www.flaticon.com</a>
+        </div>
+    </div>
+</div>
+<script>
+       jumpTo = function (addr) {
+            document.location.href = addr;
+        };
+    const isBaaS = false
+    const h = document.body.clientHeight
+        - $("header").css("height").replace("px", "")
+    $("#main").css("height", h + "px");
+    function init() {
+        const urlParams = getRequestParameters();
+        initVue();
+        initGlobal(urlParams);
+
+        if (global.urlparam["noRender"] === "true") {
+            switchRenderBtn.innerHTML = "加载界面";
+        }
+        global.cbs = {};
+
+        const urlInput = $("#urlInput");
+        if (global.urlparam["self"] === "true") {
+            if (document.location.href.startsWith("http")) {
+                let path = document.location.origin + document.location.pathname;
+                path = path.replace("/client/bdwareclient.html", "");
+                urlInput[0].value = path.replace("http",
+                    "ws");
+                if (global.urlparam["withNodeCenterWS"] === "true") {
+                    urlInput[0].value += "/NodeCenterWS";
+                }
+                connectNode();
+            }
+        } else if (global.urlparam["nodeAddr"]) {
+            urlInput[0].value = global.urlparam["nodeAddr"];
+            connectNode();
+        } else {
+            const lastNode = localStorage.getItem("lastNode");
+            if (lastNode) {
+                urlInput[0].value = lastNode;
+                connectNode();
+            }
+        }
+    }
+    init();
+    $(document).ready(function(){
+        if(localStorage.getItem("PrivKeyList") == null || localStorage.getItem("agent") == null){
+            $('#pubkeyDialog').modal();
+        }else{
+            var div = document.getElementById("user");
+          //  div.setAttribute("style","display:none");
+        }
+    })
+    $('#pubkeyDialog').on('hide.bs.modal', function () {
+        var div = document.getElementById("user");
+        var lst = JSON.parse(localStorage.getItem("PrivKeyList"));
+        lst.pop();
+        localStorage.setItem("PrivKeyList",JSON.stringify(lst));
+      });
+
+
+
+
+
+
+
+</script>
+</body>
+</html>
+<!--
+============ NodeCenter的一些链接：其中39.106.6.6监听的是1817端口。 查看节点是否启动
+http://39.106.6.6:18001/SCIDE/NodeCenter?action=ping 查看NodeCenter当前连接的节点
+http://39.106.6.6:18001/SCIDE/NodeCenter?action=listCMInfo
+
+刷新NodeCenter已连接节点的合约数据
+http://39.106.6.6:18001/SCIDE/NodeCenter?action=updateContract
+
+检查节点是否已连接，删除断开连接的节点
+http://39.106.6.6:18001/SCIDE/NodeCenter?action=checkAlive
+
+获取某个合约的日志数量
+http://39.106.6.6:18001/SCIDE/NodeCenter?action=getLogSize&contractID=BDCoin
+
+获取某个合约的日志，从第offset条，取count条
+http://39.106.6.6:18001/SCIDE/NodeCenter?action=requestLog&contractID=BDCoin&offset=16&count=10
+
+获取某个合约的日志，取最新的count条
+http://39.106.6.6:18001/SCIDE/NodeCenter?action=requestLastLog&contractID=BDCoin&count=10
+-->
--- a/index_gate.html
+++ b/index_gate.html
--- a/index_gateway.html
+++ b/index_gateway.html
@ -0,0 +1,165 @@
+<html>
+<header>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="Cache-Control" content="no-cache"/>
+    <title>北大数瑞数联网网关</title>
+    <script src="./jqueryui1.12/jquery-2.1.4.js"></script>
+
+
+    <style>
+        .halfDiv {
+            float: left;
+            width: 100%;
+            height: 100%;
+        }
+
+        .projectTreeDiv {
+            height: auto;
+            padding: 0;
+        }
+
+        .halfDivRight {
+            float: left;
+            width: 100%;
+            height: 100%;
+        }
+
+        .ui-tabs {
+            padding: 0;
+        }
+
+        .ui-accordion .ui-accordion-content {
+            padding: 0;
+        }
+
+        #tabs-1 {
+            display: none;
+        }
+
+        .ui-tabs .ui-tabs-panel {
+            padding: 0;
+        }
+
+        .context-menu-root {
+            z-index: 10;
+        }
+
+        #projectDiv {
+            height: 83%;
+            width: 20%;
+            border: 0px solid grey;
+            float: left;
+        }
+
+        .CodeMirror {
+            height: auto
+        }
+
+        .logoimg {
+            width: auto;
+            height: auto;
+            max-width: 100%;
+            max-height: 100%;
+        }
+
+        input {
+            height: 32px;
+        }
+
+        .sendTransInput {
+            background-color: #f0e4e4;
+            border-radius: 5px;
+            margin: 5px;
+            width: 15%;
+            margin-left: 4%;
+            border: 0px;
+        }
+
+        .normalDiv {
+            float: left;
+            text-align: center;
+            border-radius: 5px;
+            margin: 2%;
+            padding: 5px;
+            padding-top: 30px;
+            padding-bottom: 30px;
+            width: 45%;
+            cursor: hand;
+            background: #2E324C;
+            color: white;
+        }
+
+        .iconimg {
+            width: auto;
+            height: auto;
+            max-width: 48px;
+            max-height: 48px;
+            vertical-align: middle;
+            filter: invert(100%);
+        }
+    </style>
+
+</header>
+<body style="background: #2E324C; color: white;">
+<div
+        style="width: 90%; max-width: 1000px; min-width: 850px; margin: 0 auto; margin-top: 3%;">
+    <div style="width: 20%; float: right; margin-right: 0%">
+        <img src="./images/logo.png" class="logoimg"></img>
+    </div>
+    <div
+            style="width: fit-content; margin: 0; font-size: 200%; background-color: white; color: black; border-radius: 10px; float: left; padding: 10px;">
+        &nbsp;&nbsp;导航&nbsp;&nbsp;
+    </div>
+
+    <div
+            style="width: 100%; margin-top: 2%; float: left; background-color: white; border-radius: 10px;">
+
+        <div class="normalDiv" onclick="jumpTo('./OnlineIDE.html')">
+            <img src="./images/index/web.png" class="iconimg"></img><br/>
+            <span style="vertical-align: middle">网关接入管理</span>
+        </div>
+        <div class="normalDiv" onclick="jumpTo('./NodePortal_Gateway.html')">
+            <img src="./images/index/analysis.png" class="iconimg"></img><br/>
+            <span style="vertical-align: middle">网关配置管理</span>
+        </div>
+
+    </div>
+
+    <script>
+        jumpTo = function (addr) {
+            document.location.href = addr;
+        };
+    </script>
+
+    <br/>
+    <div style="width: fit-content; margin-top: 2%; float: right; border-radius: 10px; font-size: 50%">
+        Icons made by
+        <a href="https://www.flaticon.com/authors/monkik"
+           title="monkik" style="color: white;">monkik</a>
+        from
+        <a href="https://www.flaticon.com/" title="Flaticon"
+           style="color: white;">www.flaticon.com</a>
+    </div>
+</div>
+</body>
+</html>
+<!--  
+============ NodeCenter的一些链接：其中39.106.6.6监听的是1817端口。 查看节点是否启动
+http://39.106.6.6:18001/SCIDE/NodeCenter?action=ping 查看NodeCenter当前连接的节点
+http://39.106.6.6:18001/SCIDE/NodeCenter?action=listCMInfo
+
+刷新NodeCenter已连接节点的合约数据
+http://39.106.6.6:18001/SCIDE/NodeCenter?action=updateContract
+
+检查节点是否已连接，删除断开连接的节点
+http://39.106.6.6:18001/SCIDE/NodeCenter?action=checkAlive 
+
+获取某个合约的日志数量
+http://39.106.6.6:18001/SCIDE/NodeCenter?action=getLogSize&contractID=BDCoin
+
+获取某个合约的日志，从第offset条，取count条
+http://39.106.6.6:18001/SCIDE/NodeCenter?action=requestLog&contractID=BDCoin&offset=16&count=10
+
+获取某个合约的日志，取最新的count条
+http://39.106.6.6:18001/SCIDE/NodeCenter?action=requestLastLog&contractID=BDCoin&count=10
+-->
--- a/jqueryui1.12/.index.html.swp
+++ b/jqueryui1.12/.index.html.swp
--- a/jqueryui1.12/jquery-2.1.4.js
+++ b/jqueryui1.12/jquery-2.1.4.js
--- a/js/NodeConfig.js
+++ b/js/NodeConfig.js
@ -10,11 +10,12 @@ function loadNodeConfig(event) {

 function onLoadNodeConfig(data) {
    global.config = data.data;
+    showNodeConfig(data);
    if (!global.centerportalws) {
-        let port = global.config.nodeCenter.replace(/.*:/g, "");
-        const len = global.config.nodeCenter.length - port.length;
-        port = port - 1;
-        let url = global.config.nodeCenter.substring(0, len) + port + "/NodeCenterWS";
+        let url = global.config.nodeCenterWS;
+        if (window.location.origin.startsWith("https")){
+            url = url.replace("ws://","wss://");
+        }
        if (window.location.origin === "https://contract.internetapi.cn") {
            url = "wss://cluster.contract.internetapi.cn/NodeCenterWS";
        }
@ -28,7 +29,7 @@ function onLoadNodeConfig(data) {
            }));
        }, centerportalWSHandler);
    }
-    showNodeConfig(data);
+
 }

 function showNodeConfig(data) {
@ -38,12 +39,12 @@ function showNodeConfig(data) {
        $("#nodeNameInput")[0].value = global.config.nodeName;
        $("#ipPortInput")[0].value = global.config.ipPort;
        $("#doipConfigInput")[0].value = global.config.doipConfig;
-        $("#masterAddrInput")[0].value = global.config.masterAddress;
-        $("#peerIDInput")[0].value = global.config.peerID;
        $("#licence")[0].value = global.config.licence
        $("#expireTime").html(global.config.expireTime);
        $("#yjsInput")[0].value = global.config.yjsPath;
+        $("#nodePubKeyInput")[0].value = global.config.nodePubKey;
        nodeCenterInputEl[0].value = global.config.nodeCenter;
+        $("#nodeCenterWSInput")[0].value = global.config.nodeCenterWS;
        if (global.config.clusterConnected && global.config.clusterConnected === "true") {
            nodeCenterInputEl.css("color", "green");
        } else {
@ -114,14 +115,6 @@ function changeDOIPConfig(event) {
    }));
 }

-function changeMasterAddress(event) {
-    global.wssocket.send(JSON.stringify({
-        action: 'updateConfig',
-        key: 'masterAddress',
-        val: $("#masterAddrInput")[0].value
-    }));
-}
-
 function onChangeNodeName(data) {
    console.log("onChangeNodeName", data);
    //$("#nodeNameInput")[0].value = data;
@ -167,6 +160,14 @@ function changeNodeCenter(event) {
    }));
 }

+function changeNodeCenterWS(event) {
+    console.log("changeNodeCenterWS");
+    global.wssocket.send(JSON.stringify({
+        action: 'changeNodeCenterWS',
+        data: $("#nodeCenterWSInput")[0].value
+    }));
+}
+
 function onChangeNodeCenter(event) {
    // console.log("onChangeNodeCenter", data);
    myToast("成功", "修改NodeCenter成功")
@ -262,7 +263,7 @@ function showNodeTrustUnits(obj) {
        }
    };
    let html = "<table class='table display row-border' id='trustNodesUnitTabDivTab'>" +
-        "<thead><tr><th>序号</th><th>ID</th><th>类型</th><th>创建者</th><th>节点数目</th><th>节点公钥</th></tr></thead>" +
+        "<thead><tr><th>序号</th><th>ID</th><th>类型</th><th>创建者</th><th>节点数目</th><th>节点列表</th></tr></thead>" +
        "<tbody>";
    const tableTail = "</tbody></table>";
    if (global.nodeUnits) {
@ -275,7 +276,7 @@ function showNodeTrustUnits(obj) {
            <td>TCP</td>
            <td>${global.nodeUnits[i].key.substring(0, at_ - 1)}</td>
            <td>${nodes.length}</td>
-            <td>${JSON.stringify(nodes)}</td>
+            <td>${nodes.map(x => x.nodeName).sort().join(',')}</td>
            </tr>`
        }
    }
--- a/js/NodeContractInstances.js
+++ b/js/NodeContractInstances.js
@ -102,8 +102,6 @@ function drawConInfoTable(table) {
 <th>状态</th>
 <th>端口</th>
 <th>类型</th>
-<th>通讯</th>
-<th>共识</th>
 <!--<th>返回方式</th>-->
 <th>次数</th>
 <th>流量</th>
@ -125,19 +123,20 @@ ${table[i].name}
 <td>${table[i]['contractStatus']}</td>
 <td>${table[i].port || '-'}</td>
 <td>${table[i].type}</td>
-<td>${table[i]['networkType'] ? "P2P" : "TCP"}</td>
-<td>${table[i]['consensusType'] ? CONSENSUS_TABLE[table[i]['consensusType']] : '无'}</td>
+<!--<td>${table[i]['networkType'] ? "P2P" : "TCP"}</td>-->
+<!--<td>${table[i]['consensusType'] ? CONSENSUS_TABLE[table[i]['consensusType']] : '无'}</td>-->
 <!--<td>${table[i].responseType ? RESPONSE_TYPE_TABLE[table[i].responseType] : '-'}</td>-->
 <td>${table[i].times}</td>
 <td>${table[i]['traffic'] || '-'}</td>
 <td>${table[i].storage || '-'}</td>
 <td style='padding:2px 12px 2px 12px'>
 <button onclick="stopContractByID('${table[i].id}')" class="btn btn-secondary">停止</button>
+<button onclick="restartContractByID('${table[i].id}')" class="btn btn-secondary">重启</button>
 </td>
 </tr>`
    }
    html += tableTail;
-    html = "<h5 class='card-title'>合约实例列表</h5>" + html;
+    html = "<h5 class='card-title'>合约实例列表</h5>" + "<button onclick='pruneKilledContract()' class='btn btn-secondary' style='float:right'>清除已停合约</button>"+html;
    ciTabDiv.html(html);

    $("#ciTabDivTab").DataTable(
@ -184,6 +183,29 @@ function stopContractByID(contractID) {
    });
 }

+function pruneKilledContract() {
+    $("#dialogBodyDiv").html("是否清除已停合约" );
+    showDialog("请确认", function () {
+        global.wssocket.send(JSON.stringify({
+            action: 'pruneKilledContract',
+            requestID: new Date().getTime().toString()
+        }));
+        setTimeout(listContractProcess,1000);
+    });
+}
+
+
+function restartContractByID(contractID) {
+    $("#dialogBodyDiv").html("是否重启合约，ContractID：" + contractID);
+    showDialog("请确认", function () {
+        global.wssocket.send(JSON.stringify({
+            action: 'restartContractProcess',
+            requestID: new Date().getTime().toString(),
+            id: contractID
+        }));
+    });
+}
+
 function drawContractInstanceStatusPie(table) {
    const ciStatusPieDiv = $("#ciStatusPieDiv")
    if (ciStatusPieDiv.css("height") === "0px") {
@ -400,7 +422,7 @@ function executeContract() {
    console.log(request.arg);
    const gasLimit = $('#gasLimit').val() / 1;
    var toSign = request.contractID + "|"
-                        + request.operation + "|" + arg ;
+        + request.operation + "|" + request.arg;
    if (gasLimit > 0) {
        request.gasLimit = gasLimit;
        toSign += "|" + gasLimit;
@ -474,6 +496,7 @@ function getMask() {
    localStorage.setItem("persisArg", JSON.stringify(request));
    global.wssocket.send(JSON.stringify(request));
 }
+
 function setMask() {
    const argDiv = $('#maskArg')[0];
    const request = {};
--- a/js/NodePortal.js
+++ b/js/NodePortal.js
@ -274,7 +274,7 @@ function getControlWsUrl(host) {
    }
    path += "SCExecutor";
    if (isBaaS) {
-        path = path.replace("ide/", "")
+        path = "/SCIDE/SCExecutor"
    }
    return prefix + host + path;
 }
@ -316,8 +316,8 @@ function onNodeLogin(data) {
    console.log("onNodeLogin");
    pubkeyDialogVue.myRole = data.data;
    global.myRole = data.data;
-    loadUserMan();
    loadNodeConfig();
+    loadUserMan();
 }

 function apply() {
--- a/js/OnlineIDE.js
+++ b/js/OnlineIDE.js
@ -127,15 +127,7 @@ function getControlWsUrl(host) {
    if (document.location.href.startsWith("https")) {
        prefix = "wss://";
    }
-    let path = document.location.pathname.lastIndexOf("/");
-    path = document.location.pathname.substr(0, path + 1);
-    if (path.indexOf("SCIDE") < 0) {
-        path += "SCIDE/";
-    }
-    path += "SCExecutor";
-    if (isBaaS) {
-        path = path.replace("ide/", "")
-    }
+    path = "/SCIDE/SCExecutor";
    return prefix + host + path;
 }

@ -361,12 +353,12 @@ function initResponseAndOutputArea() {
 function onExecuteResult(obj) {
    const executeResultTitleEl = $("#executeResultTitle");
    const data = obj;
-    var sytleTail = "未知格式";
+    var styleTail = "未知格式";
    if (data.result==undefined) {
      styleTail = "Undefined";
      data.result = "";
    } else if (data.result instanceof Object) {
-        sytleTail = "JSON格式";
+        styleTail = "JSON格式";
        data.result =JSON.stringify(data.result);
    } else if (typeof data.result == 'string') {
        styleTail = "字符串格式";
--- a/js/cm.js
+++ b/js/cm.js
@ -75,9 +75,7 @@ var getControlWsUrl = function (host) {
    var prefix = "ws://";
    if (document.location.href.startsWith("https"))
        prefix = "wss://";
-    var path = document.location.pathname.lastIndexOf("/");
-    path = document.location.pathname.substr(0, path + 1);
-    path += "SCExecutor";
+    var path = "/SCIDE/SCExecutor";
    return prefix + host + path;
 };
 var initWSocket = function () {
--- a/js/codeManage/operManage.js
+++ b/js/codeManage/operManage.js
@ -120,9 +120,8 @@ var switchPeriod = function(per) {
 		return "";
 	}
 };
-
 // 本地启动
-var startContractAtSlave = function() {
+var startContractAtSlave = function(isDebug) {
 	//this is for fixed contract,not for the unit contract
 	var period = $("#selectDumpPeriod")[0].value;
 	if (period == "选择状态保存模式") {
@ -131,10 +130,29 @@ var startContractAtSlave = function() {
 	}
 	var dumpPeriod = switchPeriod(period);
 	var project = global.ypkName;
-
    $("#result")[0].innerHTML="正在启动，请稍候";
 	var request = {};
 	request.action = "startContractByYPK";
+	if (createParam.value !='') {
+	    request.createParam = createParam.value;
+	    $("#createParam").css("color","");
+        if (autoConvertStr.value=='on') {
+            try{
+              request.createParam = JSON.parse(request.createParam);
+              $("#createParam").css("color","");
+            }catch(e){
+              console.log(e);
+              $("#createParam").css("color","red");
+              alert("Create Param not JSON Format");
+              return;
+            }
+        }else{
+        }
+	}
+	if (remoteDebugPort.value !='') {
+        request.remoteDebugPort = remoteDebugPort.value;
+    }
+	request.isDebug = isDebug;
 	request.dumpPeriod = dumpPeriod;
 	request.isPrivate = global.ypkIsPrivate;
 	request.owner = global.sm2Key.publicKey;
@ -158,20 +176,20 @@ var onStartContract = function(obj) {
 };

 // 集群启动合约
-var startContractUnits = function(place) {
+function startContractUnits(place) {
    // ZYX
-	var unitsID = $("#selectUnits")[0].value.split("_")[1];
-	if(unitsID == undefined || unitsID == "选择节点集群"){
+    const unitsID = $("#selectUnits")[0].value.split("_")[1];
+    if (!unitsID || unitsID === "选择节点集群") {
        myToast("提示", "请选择节点集群!");
        return;
    }

-	var peersID = "";
-	for ( var i in global.units[unitsID]) {
+    let peersID = "";
+    for (let i in global.units[unitsID]) {
        peersID += global.units[unitsID][i].pubKey + ",";
    }

-	var request = {};
+    const request = {};

    request.action = "startContractMultiPoint";
    request.peersID = peersID;
@ -181,16 +199,37 @@ var startContractUnits = function(place) {
        myToast("提示", "请选择集群合约模式!");
        return;
    }
+    request.selectUnitNum = Number($("#selectUnitNum")[0].value);
+    if (!request.selectUnitNum || isNaN(request.selectUnitNum)) {
+        myToast("提示", "请填写集群规模！");
+        return;
+    }
    request.projectName = global.ypkName;
-	if (request.projectName==undefined || request.projectName == "请选择ypk文件"){
+    if (!request.projectName || request.projectName == "请选择ypk文件") {
        myToast("提示", "请选择合约!");
        return;
    }
    request.isPrivate = global.ypkIsPrivate;
    request.sponsorPeerID = global.peerID;   //peerID of the node
+    if (createParam.value !='') {
+	    request.createParam = createParam.value;
+	    $("#createParam").css("color","");
+        if (autoConvertStr.value=='on') {
+            try{
+              request.createParam = JSON.parse(request.createParam);
+              $("#createParam").css("color","");
+            }catch(e){
+              console.log(e);
+              $("#createParam").css("color","red");
+              alert("Create Param not JSON Format");
+              return;
+            }
+        }else{
+        }
+	}
    console.log(request);
    global.wssocket.send(JSON.stringify(request));
-};
+}

 var onStartTrustfulContract = function(obj) {
 	console.log(obj);
--- a/js/commonutil.js
+++ b/js/commonutil.js
@ -62,7 +62,15 @@ function initVue() {
                        newKey.id = this.sm2KeyList.length;
                        newKey.title = headerVue.shortName;
                        newKey.sm2Key = this.sm2KeyStr;
+                        var exist = false;
+                        for (var i=0;i<this.sm2KeyList.length;i++){
+                            var iterKey = this.sm2KeyList[i];
+                            if (iterKey.sm2Key==newKey.sm2Key)
+                                exist = true;
+                        }
+                        if (!exist)
                            this.sm2KeyList.push(newKey);
+
                        localStorage.setItem("PrivKeyList", JSON.stringify(this.sm2KeyList));
                        getSession();
                        listProjects("priv");
--- a/js/nodeCenter.js
+++ b/js/nodeCenter.js
@ -176,8 +176,6 @@ var getControlWsUrl = function(host) {
 	var prefix = "ws://";
 	if (document.location.href.startsWith("https"))
 		prefix = "wss://";
-	var path = document.location.pathname.lastIndexOf("/");
-	path = document.location.pathname.substr(0, path + 1);
-	path += "SCExecutor";
+	var path = "/SCIDE/SCExecutor";
 	return prefix + host + path;
 };
--- a/js/onlineide/rightmenu.js
+++ b/js/onlineide/rightmenu.js
@ -43,7 +43,7 @@ function startContract() {
    global.wssocket.send(JSON.stringify(request));
 }

-function startContractAsDebug() {
+function startContractAsDebug(isDebug) {
    const key = pubkeyDialogVue.sm2KeyList[pubkeyDialogVue.selectedSM2Key];
    const sm2Key = JSON.parse(key.sm2Key);
    const projectId = $("#selectedProject")[0].value;
@ -51,9 +51,28 @@ function startContractAsDebug() {
    startResult.innerText = "正在以调试模式启动合约:" + project;

    const request = {};
-    request.action = "startContractAsDebug";
+    request.action = "startContract";
    request.isPrivate = $("#privateprojecttab").hasClass("active");
-
+    if (createParam.value !='') {
+        request.createParam = createParam.value;
+        $("#createParam").css("color","");
+        if (autoConvertStr.value=='on') {
+            try{
+                request.createParam = JSON.parse(request.createParam);
+                $("#createParam").css("color","");
+            }catch(e){
+                console.log(e);
+                $("#createParam").css("color","red");
+                alert("Create Param not JSON Format");
+                return;
+            }
+        }else{
+        }
+    }
+    request.isDebug = isDebug;
+    if (remoteDebugPort.value !='') {
+        request.remoteDebugPort = remoteDebugPort.value;
+    }
    request.owner = sm2Key.publicKey;
    request.requestID = new Date().getTime() + "";
    // request.contractid = $("#tabdiv")[0].value;
@ -173,9 +192,13 @@ function importContractInstanceCodeByDOI() {
 }

 function openInClient() {
+    let path = document.location.pathname.lastIndexOf("/ide");
+    if (path > 0)
+        path = document.location.pathname.substr(0, path + 1);
+    else path = "/";
    window.open(isBaaS ?
-        `${location.origin}/client/BaaSClient.html${location.search}` :
-        `${location.origin}/client/bdwareclient.html?self=true&` +
+        `${location.origin}${path}client/BaaSClient.html${location.search}` :
+        `${location.origin}${path}client/bdwareclient.html?self=true&` +
        `contract=${mainVue.contracts[selectedContract.value].id}`);
 }

@ -220,7 +243,7 @@ function executeContract() {
    const arg = executeContractArgInput.value;
    const gasLimit = $('#gasLimit').val() / 1;
    request.pubkey = sm2Key.publicKey;
-    var toSign = request.contractID + "|"
+    let toSign = request.contractID + "|"
        + request.operation + "|" + arg;
    if (gasLimit > 0) {
        request.gasLimit = gasLimit;
Author	SHA1	Message	Date
CaiHQ	376fde8154	update doip-sdk	2023-12-15 16:36:54 +08:00
CaiHQ	2ab42516f9	update index_datanet	2022-12-13 10:39:08 +08:00
CaiHQ	141532cd19	add update node manager	2022-11-29 15:14:57 +08:00
CaiHQ	82bab8f7e3	fix nounces	2022-10-25 17:51:02 +08:00
CaiHQ	19d0c53304	support remote debug	2022-09-02 21:26:21 +08:00
CaiHQ	6f6be77dfe	front: support startMulitipoint with args fix: ContractClient missing arguments error update: @Router arguments format fix: ContractStatusRecorder null exception	2022-06-26 17:54:29 +08:00
CaiHQ	a85bd4bb14	debug raft	2022-05-27 17:48:24 +08:00
CaiHQ	b0f4c4225b	feat: support createParam	2022-04-21 10:14:00 +08:00
CaiHQ	897f59c2eb	add nodecenterws config	2022-03-30 11:17:08 +08:00
CaiHQ	a1a52ffc32	fix: MultiPointCooperationExecutor	2022-02-18 11:14:10 +08:00
Frank.R.Wu	cdcdfbdfde	fix: add a lost file add jquery-2.1.4.js to fix frontend bugs	2021-12-23 21:40:54 +08:00
CaiHQ	d0f8af9851	optimize: use jquery 2.1.4.min refactor: DOA Contract update: use doip sdk 1.0.2	2021-12-22 22:07:51 +08:00
Frank.R.Wu	965ee67409	fix: fix bugs in executeContract of NodeContractInstances.js	2021-12-12 12:25:36 +08:00
Frank.R.Wu	0dfa8a555a	style	2021-12-11 19:15:13 +08:00
CaiHQ	37476bd506	merge pbft algorithm	2021-11-22 11:50:39 +08:00
Frank.R.Wu	89360bbf0c	feat: add SelfAdaptiveShardingExecutor add new type of multi-point contract "SelfAdaptiveSharding"	2021-11-11 12:52:38 +08:00
bitvincent	f6c898dc9e	fix:typo error (shading->sharding)	2021-11-04 18:31:16 +08:00
CaiHQ	c73d1cfabf	fix openInClientBug	2021-10-26 14:17:31 +08:00
CaiHQ	e96048de2a	fix: path bug	2021-10-26 11:22:45 +08:00
Frank.R.Wu	a117a53b0b	feat: optimize the view of TrustUnits just show node names in the view of TrustUnits	2021-08-14 21:05:50 +08:00