bdware/bdcontract-web-ide
21
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: bdware:proj/zhizhen
Branches Tags
bdware:master bdware:proj/zhizhen bdware:proj/nanning
bdware:v1.6.6 bdware:v1.4.5
..
compare: bdware:v1.6.6
Branches Tags
bdware:master bdware:proj/zhizhen bdware:proj/nanning
bdware:v1.6.6 bdware:v1.4.5

10 Commits
proj/zhizh ... v1.6.6

Author SHA1 Message Date
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
23 changed files with 2956 additions and 9323 deletions
Expand all files Collapse all files

4
BaaSOnlineIDE.html
View File

@@ -2,7 +2,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Cache-Control" content="no-cache"/> <meta http-equiv="Cache-Control" content="no-cache"/>
<title>智能合约在线编辑器</title> <title>数瑞智能合约在线编辑器</title>
<script src="./jqueryui1.12/jquery-2.1.4.js"></script> <script src="./jqueryui1.12/jquery-2.1.4.js"></script>
<link href="./jqueryui1.12/jquery-ui.css" rel="stylesheet"> <link href="./jqueryui1.12/jquery-ui.css" rel="stylesheet">
<script src="./jqueryui1.12/jquery-ui.js"></script> <script src="./jqueryui1.12/jquery-ui.js"></script>
@@ -134,7 +134,7 @@
<div class="col-4"> <div class="col-4">
<a class="navbar-brand" href="#"> <img alt="Brand" <a class="navbar-brand" href="#"> <img alt="Brand"
src="./images/logo-1.png" style="height: 30px;"> 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;"> name="file" multiple onchange="uploadFile()" style="display: none;">
</div> </div>
<div class="nav navbar-right userName" data-toggle="modal" <div class="nav navbar-right userName" data-toggle="modal"

18
NodePortal.html
View File

@@ -2,7 +2,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Cache-Control" content="no-cache"/> <meta http-equiv="Cache-Control" content="no-cache"/>
<title>智能合约节点管理中心</title> <title>数瑞智能合约节点管理中心</title>
<script src="./jqueryui1.12/jquery-2.1.4.js"></script> <script src="./jqueryui1.12/jquery-2.1.4.js"></script>
<script src="./js/popper.min.js"></script> <script src="./js/popper.min.js"></script>
@@ -67,7 +67,7 @@
<div class="col-4"> <div class="col-4">
<a class="navbar-brand" href="#"> <img alt="Brand" <a class="navbar-brand" href="#"> <img alt="Brand"
src="./images/logo-1.png" style="height: 30px"> src="./images/logo-1.png" style="height: 30px">
</a> <span>智能合约节点管理中心</span> </a> <span>数瑞智能合约节点管理中心</span>
</div> </div>
<div class="nav navbar-right userName" data-toggle="modal" <div class="nav navbar-right userName" data-toggle="modal"
@@ -280,7 +280,9 @@
<option value="3">RARF</option> <option value="3">RARF</option>
<option value="4">RARH</option> <option value="4">RARH</option>
<option value="5">RARA</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>
</select> </select>
<div class="btn-group mr-3" role="group" <div class="btn-group mr-3" role="group"
style="margin-left: 2%"> style="margin-left: 2%">
@@ -504,7 +506,8 @@
</div> </div>
<input type="text" class="form-control" placeholder="输入参数" id="arg"> <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-append">
<div class="input-group-text"> <div class="input-group-text">
<input type="checkbox" id="executeContractAsDebug" <input type="checkbox" id="executeContractAsDebug"
@@ -553,7 +556,8 @@
<span class="input-group-text">参数</span> <span class="input-group-text">参数</span>
</div> </div>
<input type="text" class="form-control" placeholder="输入参数" id="maskArg"> <input type="text" class="form-control" placeholder="输入参数"
id="maskArg">
<div class="input-group-append"> <div class="input-group-append">
<button onclick="getMask()" type="button" <button onclick="getMask()" type="button"
@@ -586,7 +590,8 @@
<span class="input-group-text">参数</span> <span class="input-group-text">参数</span>
</div> </div>
<input type="text" class="form-control" placeholder="输入参数" id="mockArg"> <input type="text" class="form-control" placeholder="输入参数"
id="mockArg">
<div class="input-group-append"> <div class="input-group-append">
<button onclick="getMock()" type="button" <button onclick="getMock()" type="button"
@@ -1335,6 +1340,7 @@
//initWSocket(); //initWSocket();
</script> </script>
</body> </body>

1333
NodePortal_Gateway.html Normal file
View File

File diff suppressed because it is too large Load Diff

18
OnlineIDE.html
View File

@@ -35,7 +35,11 @@
<!--script src="./js/echartsTheme.js"></script --> <!--script src="./js/echartsTheme.js"></script -->
<!-- script src="./js/echarts-gl.min.js"></script --> <!-- script src="./js/echarts-gl.min.js"></script -->
<script src="./js/sm2.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/d3.v5.min.js"></script>
<!-- script src="./js/dagre-d3.min.js"></script --> <!-- script src="./js/dagre-d3.min.js"></script -->
<script src="./js/tipsy/jquery.tipsy.min.js"></script> <script src="./js/tipsy/jquery.tipsy.min.js"></script>
@@ -64,7 +68,7 @@
} }
.projectButton.ui-state-active { .projectButton.ui-state-active {
background: #304156; background: #2E324C;
color: white; color: white;
} }
@@ -78,8 +82,8 @@
.nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link { .nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link {
color: white; color: white;
background-color: #304156; background-color: #2E324C;
border-color: #304156; border-color: #2E324C;
} }
.ui-tabs { .ui-tabs {
@@ -95,14 +99,14 @@
} }
.ui-menu-item.ui-state-active:hover { .ui-menu-item.ui-state-active:hover {
background: #304156; background: #2E324C;
color: white; color: white;
border: 1px solid #999; border: 1px solid #999;
} }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active, .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active,
a.ui-button:active, .ui-button:active, .ui-button.ui-state-active:hover { a.ui-button:active, .ui-button:active, .ui-button.ui-state-active:hover {
background: #304156; background: #2E324C;
color: white; color: white;
border: 1px solid #999; border: 1px solid #999;
} }
@@ -116,7 +120,7 @@
} }
.fileLine:hover { .fileLine:hover {
background: #304156; background: #2E324C;
color: white; color: white;
cursor: pointer; cursor: pointer;
} }
@@ -135,7 +139,7 @@
<div class="col-4"> <div class="col-4">
<a class="navbar-brand" href="#"> <img alt="Brand" <a class="navbar-brand" href="#"> <img alt="Brand"
src="./images/logo-1.png" style="height: 30px"> 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;"> name="file" multiple onchange="uploadFile()" style="display: none;">
</div> </div>
<div class="nav navbar-right userName" data-toggle="modal" <div class="nav navbar-right userName" data-toggle="modal"

12
OnlineIDE_en.html
View File

@@ -58,7 +58,7 @@
} }
.projectButton.ui-state-active { .projectButton.ui-state-active {
background: #304156; background: #2E324C;
color: white; color: white;
} }
@@ -72,8 +72,8 @@
.nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link { .nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link {
color: white; color: white;
background-color: #304156; background-color: #2E324C;
border-color: #304156; border-color: #2E324C;
} }
.ui-tabs { .ui-tabs {
@@ -89,14 +89,14 @@
} }
.ui-menu-item.ui-state-active:hover { .ui-menu-item.ui-state-active:hover {
background: #304156; background: #2E324C;
color: white; color: white;
border: 1px solid #999; border: 1px solid #999;
} }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active, .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active,
a.ui-button:active, .ui-button:active, .ui-button.ui-state-active:hover { a.ui-button:active, .ui-button:active, .ui-button.ui-state-active:hover {
background: #304156; background: #2E324C;
color: white; color: white;
border: 1px solid #999; border: 1px solid #999;
} }
@@ -110,7 +110,7 @@
} }
.fileLine:hover { .fileLine:hover {
background: #304156; background: #2E324C;
color: white; color: white;
cursor: pointer; cursor: pointer;
} }

2
css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

16
css/common.css
View File

@@ -9,7 +9,7 @@
border: 1px solid rgba(0, 0, 0, .125); border: 1px solid rgba(0, 0, 0, .125);
border-radius: 5px; border-radius: 5px;
background: white; background: white;
color: #304156; color: #2E324C;
} }
.userName:hover { .userName:hover {
@@ -22,17 +22,17 @@
#horiNav { #horiNav {
padding-top: 10px; padding-top: 10px;
border: 1px solid rgba(0, 0, 0, .05); border: 1px solid rgba(0, 0, 0, .05);
background: #e9f6ff; background: #f8f9fa;
} }
#outputNav { #outputNav {
padding-top: 10px; padding-top: 10px;
border: 1px solid rgba(0, 0, 0, .05); border: 1px solid rgba(0, 0, 0, .05);
background: #e9f6ff; background: #f8f9fa;
} }
div .card { div .card {
background: #e9f6ff; background: #f8f9fa;
} }
#main { #main {
@@ -85,16 +85,16 @@ div .card {
.projectLine.collapsed { .projectLine.collapsed {
background: #D5D6DB; background: #D5D6DB;
color: #304156; color: #2E324C;
} }
.projectLine { .projectLine {
background: #304156; background: #2E324C;
color: white; color: white;
} }
.projectLine.collapsed:hover { .projectLine.collapsed:hover {
background: #304156; background: #2E324C;
color: white; color: white;
} }
@@ -111,7 +111,7 @@ div .card {
} }
.headerFooter { .headerFooter {
background: #304156; background: #2E324C;
color: white; color: white;
} }

BIN
images/logo-1.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
images/logo.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 37 KiB

4
index.html
View File

@@ -85,7 +85,7 @@
padding-bottom: 30px; padding-bottom: 30px;
width: 28%; width: 28%;
cursor: hand; cursor: hand;
background: #304156; background: #2E324C;
color: white; color: white;
} }
@@ -100,7 +100,7 @@
</style> </style>
</header> </header>
<body style="background: #304156; color: white;"> <body style="background: #2E324C; color: white;">
<div <div
style="width: 90%; max-width: 1000px; min-width: 850px; margin: 0 auto; margin-top: 3%;"> style="width: 90%; max-width: 1000px; min-width: 850px; margin: 0 auto; margin-top: 3%;">
<div style="width: 20%; float: right; margin-right: 0%"> <div style="width: 20%; float: right; margin-right: 0%">

1333
index_gate.html Normal file
View File

File diff suppressed because it is too large Load Diff

165
index_gateway.html Normal file
View File

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

BIN
jqueryui1.12/.index.html.swp
View File

Binary file not shown.

9214
jqueryui1.12/jquery-2.1.4.js vendored Executable file → Normal file
View File

File diff suppressed because one or more lines are too long

6
js/NodeConfig.js
View File

@@ -262,7 +262,7 @@ function showNodeTrustUnits(obj) {
} }
}; };
let html = "<table class='table display row-border' id='trustNodesUnitTabDivTab'>" + 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>"; "<tbody>";
const tableTail = "</tbody></table>"; const tableTail = "</tbody></table>";
if (global.nodeUnits) { if (global.nodeUnits) {
@@ -275,12 +275,12 @@ function showNodeTrustUnits(obj) {
<td>TCP</td> <td>TCP</td>
<td>${global.nodeUnits[i].key.substring(0, at_ - 1)}</td> <td>${global.nodeUnits[i].key.substring(0, at_ - 1)}</td>
<td>${nodes.length}</td> <td>${nodes.length}</td>
<td>${JSON.stringify(nodes)}</td> <td>${nodes.map(x => x.nodeName).sort().join(',')}</td>
</tr>` </tr>`
} }
} }
if (global.p2pNodes) { if (global.p2pNodes) {
html += "<tr><td>" + (i+1) + "</td> <td>P2PUnit</td><td>P2P</td> <td>bdledger</td> <td>" + global.p2pNodes.length + "</td> <td>" + JSON.stringify(global.p2pNodes) + "</td> </tr>"; html += "<tr><td>" + (i + 1) + "</td> <td>P2PUnit</td><td>P2P</td> <td>bdledger</td> <td>" + global.p2pNodes.length + "</td> <td>" + JSON.stringify(global.p2pNodes) + "</td> </tr>";
} }
html += tableTail; html += tableTail;
$("#trustNodesUnitTabDiv").html(html); $("#trustNodesUnitTabDiv").html(html);

35
js/NodeContractInstances.js
View File

@@ -137,7 +137,7 @@ ${table[i].name}
</tr>` </tr>`
} }
html += tableTail; html += tableTail;
html = "<h5 class='card-title'>合约实例列表</h5>" + html; html = "<h5 class='card-title'>DO实例列表</h5>" + html;
ciTabDiv.html(html); ciTabDiv.html(html);
$("#ciTabDivTab").DataTable( $("#ciTabDivTab").DataTable(
@@ -398,14 +398,14 @@ function executeContract() {
request.pubkey = global.sm2Key.publicKey; request.pubkey = global.sm2Key.publicKey;
request.isDebug = executeContractAsDebug.checked; request.isDebug = executeContractAsDebug.checked;
console.log(request.arg); console.log(request.arg);
const gasLimit = $('#gasLimit').val()/1; const gasLimit = $('#gasLimit').val() / 1;
var toSign = request.contractID + "|" var toSign = request.contractID + "|"
+ request.operation + "|" + arg ; + request.operation + "|" + request.arg;
if (gasLimit>0){ if (gasLimit > 0) {
request.gasLimit = gasLimit; request.gasLimit = gasLimit;
toSign+= "|" + gasLimit; toSign += "|" + gasLimit;
} }
toSign+= "|" + global.sm2Key.publicKey; toSign += "|" + global.sm2Key.publicKey;
request.signature = sm2.doSignature( request.signature = sm2.doSignature(
toSign, toSign,
global.sm2Key.privateKey, global.sm2Key.privateKey,
@@ -431,9 +431,9 @@ function onExecuteResult(obj) {
$("#responseArea")[0].value = result.result; $("#responseArea")[0].value = result.result;
} }
$("#responseID").html(`请求ID:${obj['responseID']}`); $("#responseID").html(`请求ID:${obj['responseID']}`);
var gasInfo=""; var gasInfo = "";
if (obj.executionGas!=undefined && obj.executionGas>0) if (obj.executionGas != undefined && obj.executionGas > 0)
gasInfo="<br>"+obj.executionGas+"gas"; gasInfo = "<br>" + obj.executionGas + "gas";
$("#responseTime").html(`响应时间:${obj['executeTime']}ms${gasInfo}${styleTail}`); $("#responseTime").html(`响应时间:${obj['executeTime']}ms${gasInfo}${styleTail}`);
} catch (e) { } catch (e) {
$("#responseStatus").html("执行状态：Failed"); $("#responseStatus").html("执行状态：Failed");
@@ -461,12 +461,12 @@ function getMask() {
console.log(request.arg); console.log(request.arg);
//const gasLimit = $('#gasLimit').val()/1; //const gasLimit = $('#gasLimit').val()/1;
var toSign = request.contractID + "|" var toSign = request.contractID + "|"
+ request.operation + "|" + arg ; + request.operation + "|" + arg;
/*if (gasLimit>0){ /*if (gasLimit>0){
request.gasLimit = gasLimit; request.gasLimit = gasLimit;
toSign+= "|" + gasLimit; toSign+= "|" + gasLimit;
}*/ }*/
toSign+= "|" + global.sm2Key.publicKey; toSign += "|" + global.sm2Key.publicKey;
request.signature = sm2.doSignature( request.signature = sm2.doSignature(
toSign, toSign,
global.sm2Key.privateKey, global.sm2Key.privateKey,
@@ -474,6 +474,7 @@ function getMask() {
localStorage.setItem("persisArg", JSON.stringify(request)); localStorage.setItem("persisArg", JSON.stringify(request));
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify(request));
} }
function setMask() { function setMask() {
const argDiv = $('#maskArg')[0]; const argDiv = $('#maskArg')[0];
const request = {}; const request = {};
@@ -492,12 +493,12 @@ function setMask() {
console.log(request.arg); console.log(request.arg);
//const gasLimit = $('#gasLimit').val()/1; //const gasLimit = $('#gasLimit').val()/1;
var toSign = request.contractID + "|" var toSign = request.contractID + "|"
+ request.operation + "|" + arg ; + request.operation + "|" + arg;
/*if (gasLimit>0){ /*if (gasLimit>0){
request.gasLimit = gasLimit; request.gasLimit = gasLimit;
toSign+= "|" + gasLimit; toSign+= "|" + gasLimit;
}*/ }*/
toSign+= "|" + global.sm2Key.publicKey; toSign += "|" + global.sm2Key.publicKey;
request.signature = sm2.doSignature( request.signature = sm2.doSignature(
toSign, toSign,
global.sm2Key.privateKey, global.sm2Key.privateKey,
@@ -535,12 +536,12 @@ function getMock() {
console.log(request.arg); console.log(request.arg);
//const gasLimit = $('#gasLimit').val()/1; //const gasLimit = $('#gasLimit').val()/1;
var toSign = request.contractID + "|" var toSign = request.contractID + "|"
+ request.operation + "|" + arg ; + request.operation + "|" + arg;
/*if (gasLimit>0){ /*if (gasLimit>0){
request.gasLimit = gasLimit; request.gasLimit = gasLimit;
toSign+= "|" + gasLimit; toSign+= "|" + gasLimit;
}*/ }*/
toSign+= "|" + global.sm2Key.publicKey; toSign += "|" + global.sm2Key.publicKey;
request.signature = sm2.doSignature( request.signature = sm2.doSignature(
toSign, toSign,
global.sm2Key.privateKey, global.sm2Key.privateKey,
@@ -567,12 +568,12 @@ function setMock() {
console.log(request.arg); console.log(request.arg);
//const gasLimit = $('#gasLimit').val()/1; //const gasLimit = $('#gasLimit').val()/1;
var toSign = request.contractID + "|" var toSign = request.contractID + "|"
+ request.operation + "|" + arg ; + request.operation + "|" + arg;
/*if (gasLimit>0){ /*if (gasLimit>0){
request.gasLimit = gasLimit; request.gasLimit = gasLimit;
toSign+= "|" + gasLimit; toSign+= "|" + gasLimit;
}*/ }*/
toSign+= "|" + global.sm2Key.publicKey; toSign += "|" + global.sm2Key.publicKey;
request.signature = sm2.doSignature( request.signature = sm2.doSignature(
toSign, toSign,
global.sm2Key.privateKey, global.sm2Key.privateKey,

4
js/NodePortal.js
View File

@@ -274,7 +274,7 @@ function getControlWsUrl(host) {
} }
path += "SCExecutor"; path += "SCExecutor";
if (isBaaS) { if (isBaaS) {
path = path.replace("ide/", "") path = "/SCIDE/SCExecutor"
} }
return prefix + host + path; return prefix + host + path;
} }
@@ -316,8 +316,8 @@ function onNodeLogin(data) {
console.log("onNodeLogin"); console.log("onNodeLogin");
pubkeyDialogVue.myRole = data.data; pubkeyDialogVue.myRole = data.data;
global.myRole = data.data; global.myRole = data.data;
loadUserMan();
loadNodeConfig(); loadNodeConfig();
loadUserMan();
} }
function apply() { function apply() {

10
js/OnlineIDE.js
View File

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

4
js/cm.js
View File

@@ -75,9 +75,7 @@ var getControlWsUrl = function (host) {
var prefix = "ws://"; var prefix = "ws://";
if (document.location.href.startsWith("https")) if (document.location.href.startsWith("https"))
prefix = "wss://"; prefix = "wss://";
var path = document.location.pathname.lastIndexOf("/"); var path = "/SCIDE/SCExecutor";
path = document.location.pathname.substr(0, path + 1);
path += "SCExecutor";
return prefix + host + path; return prefix + host + path;
}; };
var initWSocket = function () { var initWSocket = function () {

29
js/codeManage/operManage.js
View File

@@ -158,39 +158,44 @@ var onStartContract = function(obj) {
}; };
// 集群启动合约 // 集群启动合约
var startContractUnits = function(place) { function startContractUnits(place) {
// ZYX // ZYX
var unitsID = $("#selectUnits")[0].value.split("_")[1]; const unitsID = $("#selectUnits")[0].value.split("_")[1];
if(unitsID == undefined || unitsID == "选择节点集群"){ if (!unitsID || unitsID === "选择节点集群") {
myToast("提示","请选择节点集群!"); myToast("提示", "请选择节点集群!");
return; return;
} }
var peersID = ""; let peersID = "";
for ( var i in global.units[unitsID]) { for (let i in global.units[unitsID]) {
peersID += global.units[unitsID][i].pubKey + ","; peersID += global.units[unitsID][i].pubKey + ",";
} }
var request = {}; const request = {};
request.action = "startContractMultiPoint"; request.action = "startContractMultiPoint";
request.peersID = peersID; request.peersID = peersID;
request.type = $("#sequence")[0].value; request.type = $("#sequence")[0].value;
console.log(request.type); console.log(request.type);
if (request.type==0){ if (request.type == 0) {
myToast("提示","请选择集群合约模式!"); myToast("提示", "请选择集群合约模式!");
return;
}
request.selectUnitNum = Number($("#selectUnitNum")[0].value);
if (!request.selectUnitNum || isNaN(request.selectUnitNum)) {
myToast("提示", "请填写集群规模！");
return; return;
} }
request.projectName = global.ypkName; request.projectName = global.ypkName;
if (request.projectName==undefined || request.projectName == "请选择ypk文件"){ if (!request.projectName || request.projectName == "请选择ypk文件") {
myToast("提示","请选择合约!"); myToast("提示", "请选择合约!");
return; return;
} }
request.isPrivate = global.ypkIsPrivate; request.isPrivate = global.ypkIsPrivate;
request.sponsorPeerID = global.peerID; //peerID of the node request.sponsorPeerID = global.peerID; //peerID of the node
console.log(request); console.log(request);
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify(request));
}; }
var onStartTrustfulContract = function(obj) { var onStartTrustfulContract = function(obj) {
console.log(obj); console.log(obj);

2
js/commonutil.js
View File

@@ -3,7 +3,7 @@ function getDateDaysBefore(daysAgo) {
return new Date(dateStr).getTime() - daysAgo * 24 * 3600 * 1000; return new Date(dateStr).getTime() - daysAgo * 24 * 3600 * 1000;
} }
let primaryColor = "#304156"; let primaryColor = "#2E324C";
// ======Vue start // ======Vue start
let headerVue = ""; let headerVue = "";

4
js/nodeCenter.js
View File

@@ -176,8 +176,6 @@ var getControlWsUrl = function(host) {
var prefix = "ws://"; var prefix = "ws://";
if (document.location.href.startsWith("https")) if (document.location.href.startsWith("https"))
prefix = "wss://"; prefix = "wss://";
var path = document.location.pathname.lastIndexOf("/"); var path = "/SCIDE/SCExecutor";
path = document.location.pathname.substr(0, path + 1);
path += "SCExecutor";
return prefix + host + path; return prefix + host + path;
}; };

20
js/onlineide/rightmenu.js
View File

@@ -173,9 +173,13 @@ function importContractInstanceCodeByDOI() {
} }
function openInClient() { 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 ? window.open(isBaaS ?
`${location.origin}/client/BaaSClient.html${location.search}` : `${location.origin}${path}client/BaaSClient.html${location.search}` :
`${location.origin}/client/bdwareclient.html?self=true&` + `${location.origin}${path}client/bdwareclient.html?self=true&` +
`contract=${mainVue.contracts[selectedContract.value].id}`); `contract=${mainVue.contracts[selectedContract.value].id}`);
} }
@@ -218,15 +222,15 @@ function executeContract() {
request.contractID = contract.id; request.contractID = contract.id;
request.operation = contract.exportedFunctions[selectedFunction.value].functionName; request.operation = contract.exportedFunctions[selectedFunction.value].functionName;
const arg = executeContractArgInput.value; const arg = executeContractArgInput.value;
const gasLimit = $('#gasLimit').val()/1; const gasLimit = $('#gasLimit').val() / 1;
request.pubkey = sm2Key.publicKey; request.pubkey = sm2Key.publicKey;
var toSign = request.contractID + "|" let toSign = request.contractID + "|"
+ request.operation + "|" + arg ; + request.operation + "|" + arg;
if (gasLimit>0){ if (gasLimit > 0) {
request.gasLimit = gasLimit; request.gasLimit = gasLimit;
toSign+= "|" + gasLimit; toSign += "|" + gasLimit;
} }
toSign+= "|" + sm2Key.publicKey; toSign += "|" + sm2Key.publicKey;
request.signature = sm2.doSignature( request.signature = sm2.doSignature(
toSign, toSign,
sm2Key.privateKey, sm2Key.privateKey,