merge: merge old web-client
This commit is contained in:
Frank.R.Wu
parent
0ede1c3919
commit
1ead2613a9
@ -3,28 +3,28 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||
<meta http-equiv="Cache-Control" content="no-cache"/>
|
||||
<title>数瑞客户端</title>
|
||||
|
||||
<script src="./js/createWS.js"></script>
|
||||
<script src="./js/cryptico.js"></script>
|
||||
<script src="./js/jquery-2.1.4.js"></script>
|
||||
<script src="./js/bootstrap.min.js"></script>
|
||||
<script src="./js/commonutil.js"></script>
|
||||
|
||||
<link href="./css/common.css" rel="stylesheet">
|
||||
<link href="./css/bootstrap.min.css" rel="stylesheet">
|
||||
<script src="./js/vue.js"></script>
|
||||
<script src="./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>
|
||||
<header
|
||||
class="headerFooter navbar navbar-default navbar-fixed-top navColor ">
|
||||
<header class="headerFooter navbar navbar-default navbar-fixed-top navColor ">
|
||||
<div class="col-10">
|
||||
<div class="input-group">
|
||||
<a class="navbar-brand" href="#"> <img alt="Brand"
|
||||
<a class="navbar-brand" href="#">
|
||||
<img alt="Brand"
|
||||
src="./img/logo-1.png" style="height: 30px">
|
||||
</a><a class="navbar-brand">数瑞浏览器 </a>
|
||||
<div class="input-group-prepend" >
|
||||
</a>
|
||||
<a class="navbar-brand">数瑞浏览器 </a>
|
||||
<div class="input-group-prepend">
|
||||
<input id="urlInput" style="border-top-left-radius: 5px; border-bottom-left-radius: 5px"
|
||||
type="text" placeholder="输入地址">
|
||||
</div>
|
||||
@ -34,12 +34,13 @@
|
||||
</button>
|
||||
</div>
|
||||
<div class="input-group-append">
|
||||
<button class="btn btn-outline-secondary" style="border-top-right-radius: 5px; border-bottom-right-radius: 5px" id="switchRenderBtn" type="button"
|
||||
<button class="btn btn-outline-secondary"
|
||||
style="border-top-right-radius: 5px; border-bottom-right-radius: 5px" id="switchRenderBtn"
|
||||
type="button"
|
||||
onclick="changeRender()">不加载界面
|
||||
</button>
|
||||
</div>
|
||||
<span> </span>
|
||||
|
||||
<div class="input-group-append">
|
||||
<select id="selectContract" class="custom-select"
|
||||
style="-webkit-appearance: none" onchange="changeApp()">
|
||||
@ -71,12 +72,10 @@
|
||||
</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"
|
||||
@ -98,7 +97,6 @@
|
||||
</div>
|
||||
</div>
|
||||
<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>
|
||||
@ -124,7 +122,6 @@
|
||||
style="width: 100%; min-height: 150px" rows="" cols="">
|
||||
</textarea>
|
||||
<div class="row" style="padding-left: 16px; padding-right: 16px;">
|
||||
|
||||
</div>
|
||||
<div class="row" style="padding-left: 16px; padding-right: 16px">
|
||||
<span>我的权限：{{myRole}}</span>
|
||||
@ -143,16 +140,10 @@
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="modal fade" id="dialog" tabindex="-1" role="dialog"
|
||||
aria-labelledby="exampleModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog" role="document">
|
||||
@ -176,16 +167,12 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
var h = document.body.clientHeight
|
||||
- $("header").css("height").replace("px", "")
|
||||
|
||||
<script>
|
||||
const h = document.body.clientHeight
|
||||
- $("header").css("height").replace("px", "")
|
||||
$("#main").css("height", h + "px");
|
||||
init();
|
||||
|
||||
//initWSocket();
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
@ -243,6 +243,11 @@ function onExecuteResult(obj) {
|
||||
onExecuteResultInternal(obj);
|
||||
}
|
||||
|
||||
function onExecuteContractTrustfully(obj) {
|
||||
console.log(obj);
|
||||
$("#consistencyResult").html(global.executeResult.size + "个结果一致");
|
||||
}
|
||||
|
||||
function showContractResult(requestID) {
|
||||
var data = global.responseCollector[requestID][0];
|
||||
result = data;
|
||||
@ -601,7 +606,7 @@ function renewList() {
|
||||
for (let i = 0; i < global.contracts.length; ++i) {
|
||||
const c = global.contracts[i];
|
||||
console.log(c);
|
||||
if (c.contractStatus=="KILLED") continue;
|
||||
if (c.contractStatus == "KILLED") continue;
|
||||
if (!c.id) {
|
||||
c.id = c.contractID;
|
||||
}
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
var createWssocket = function(wsurl, onopen, handler) {
|
||||
var createWssocket = function (wsurl, onopen, handler) {
|
||||
console.log("[createWS.js] createWssocket : " + wsurl);
|
||||
var retsocket = {};
|
||||
retsocket.handlerList = [];
|
||||
if (handler != undefined)
|
||||
if (handler)
|
||||
retsocket.handlerList.push(handler);
|
||||
var wssocket = new WebSocket(wsurl);
|
||||
wssocket.onerror = function(error) {
|
||||
wssocket.onerror = function (error) {
|
||||
console.log(error);
|
||||
};
|
||||
|
||||
wssocket.onopen = onopen;
|
||||
var onmessage = function(event) {
|
||||
var onmessage = function (event) {
|
||||
var obj = JSON.parse(event.data);
|
||||
switch (obj.action) {
|
||||
case 'sendNextSegment':
|
||||
@ -27,8 +27,8 @@ var createWssocket = function(wsurl, onopen, handler) {
|
||||
}
|
||||
};
|
||||
|
||||
var reconnect = function(error) {
|
||||
setTimeout(function() {
|
||||
var reconnect = function (error) {
|
||||
setTimeout(function () {
|
||||
console.log("[createWS.js] try to reconnect");
|
||||
wssocket = new WebSocket(wsurl);
|
||||
wssocket.onclose = reconnect;
|
||||
@ -38,12 +38,12 @@ var createWssocket = function(wsurl, onopen, handler) {
|
||||
};
|
||||
wssocket.onclose = reconnect;
|
||||
|
||||
retsocket.receiveSeg = function(obj) {
|
||||
if (obj.cid == 'start') {
|
||||
retsocket.receiveSeg = function (obj) {
|
||||
if (obj.cid === 'start') {
|
||||
retsocket.toReceive = "";
|
||||
}
|
||||
retsocket.toReceive += obj.data;
|
||||
if (obj.cid == 'done') {
|
||||
if (obj.cid === 'done') {
|
||||
console.log("[receiveSeg] Received AllData:" + retsocket.toReceive);
|
||||
var event = {};
|
||||
event.data = retsocket.toReceive;
|
||||
@ -55,7 +55,7 @@ var createWssocket = function(wsurl, onopen, handler) {
|
||||
|
||||
retsocket.isSending = false;
|
||||
retsocket.sendList = [];
|
||||
retsocket.monitor = function() {
|
||||
retsocket.monitor = function () {
|
||||
if (!retsocket.isSending) {
|
||||
if (retsocket.sendList.length > 0) {
|
||||
retsocket.send(retsocket.sendList.pop());
|
||||
@ -65,7 +65,7 @@ var createWssocket = function(wsurl, onopen, handler) {
|
||||
};
|
||||
// TODO: we don't need monitor at all?
|
||||
retsocket.monitor();
|
||||
retsocket.send = function(str) {
|
||||
retsocket.send = function (str) {
|
||||
if (retsocket.isSending) {
|
||||
retsocket.sendList.push(str);
|
||||
return;
|
||||
@ -80,17 +80,16 @@ var createWssocket = function(wsurl, onopen, handler) {
|
||||
} else
|
||||
wssocket.send(str);
|
||||
};
|
||||
retsocket.sendNextSegment = function() {
|
||||
retsocket.sendNextSegment = function () {
|
||||
var str = retsocket.toSend;
|
||||
const obj = {};
|
||||
if (str.length > 1024) {
|
||||
retsocket.toSend = str.substr(1024);
|
||||
var obj = {};
|
||||
obj.isSegment = true;
|
||||
obj.data = str.substr(0, 1024);
|
||||
wssocket.send(JSON.stringify(obj));
|
||||
} else {
|
||||
retsocket.toSend = "";
|
||||
var obj = {};
|
||||
obj.isSegment = false;
|
||||
obj.data = str;
|
||||
wssocket.send(JSON.stringify(obj));
|
||||
@ -100,16 +99,16 @@ var createWssocket = function(wsurl, onopen, handler) {
|
||||
}
|
||||
}
|
||||
};
|
||||
retsocket.isOpen = function() {
|
||||
retsocket.isOpen = function () {
|
||||
return wssocket.readyState;
|
||||
}
|
||||
retsocket.addHandler = function(handler) {
|
||||
retsocket.addHandler = function (handler) {
|
||||
retsocket.handlerList.push(handler);
|
||||
}
|
||||
return retsocket;
|
||||
};
|
||||
|
||||
var aesDecrypt = function(data) {
|
||||
var aesDecrypt = function (data) {
|
||||
data = cryptico.b64to256(data);
|
||||
var encryptedBlocks = cryptico.string2bytes(data);
|
||||
var exkey = global.aesKey.slice(0);
|
||||
@ -118,9 +117,8 @@ var aesDecrypt = function(data) {
|
||||
return cryptico.bytes2string(encryptedBlocks);
|
||||
|
||||
};
|
||||
var aesEncrypt = function(data, aesKey) {
|
||||
var key = aesKey;
|
||||
var exkey = key.slice(0);
|
||||
var aesEncrypt = function (data, aesKey) {
|
||||
var exkey = aesKey.slice(0);
|
||||
aes.ExpandKey(exkey);
|
||||
var blocks = my.string2bytes(data);
|
||||
blocks = my.pad16(blocks);
|
||||
@ -129,13 +127,12 @@ var aesEncrypt = function(data, aesKey) {
|
||||
ciphertext = cryptico.b256to64(ciphertext);
|
||||
return ciphertext;
|
||||
};
|
||||
var rsaEncrypt = function(data, rsaKey) {
|
||||
var rsaEncrypt = function (data, rsaKey) {
|
||||
var rsa = new RSAKey();
|
||||
rsa.setPublic(rsaKey.n, rsaKey.e1);
|
||||
var result = rsa.encrypt(data);
|
||||
return result;
|
||||
return rsa.encrypt(data);
|
||||
};
|
||||
var loadRSAKey = function(rsaKey) {
|
||||
var loadRSAKey = function (rsaKey) {
|
||||
var str = cryptico.b64to256(rsaKey);
|
||||
str = str.split(",");
|
||||
var ret = {};
|
||||
@ -144,7 +141,7 @@ var loadRSAKey = function(rsaKey) {
|
||||
ret.e2 = str[2];
|
||||
return ret;
|
||||
};
|
||||
var testRSA = function() {
|
||||
var testRSA = function () {
|
||||
pubKey = loadRSAKey(global.privKey);
|
||||
reqContent = {};
|
||||
reqContent.action = "main";
|
||||
@ -155,7 +152,7 @@ var testRSA = function() {
|
||||
+ encodeURIComponent(JSON.stringify(eReq));
|
||||
};
|
||||
|
||||
var encryptReq = function(reqContent, pubKey) {
|
||||
var encryptReq = function (reqContent, pubKey) {
|
||||
// global.pubKey = loadRSAKey(global.privKey);
|
||||
var aes = {};
|
||||
aes.key = cryptico.generateAESKey();
|
||||
@ -173,16 +170,16 @@ var encryptReq = function(reqContent, pubKey) {
|
||||
return encrypedReq;
|
||||
};
|
||||
|
||||
var onExecuteResultInternal = function(data) {
|
||||
var onExecuteResultInternal = function (data) {
|
||||
console.log(data);
|
||||
global.executeResult = data;
|
||||
var reqId = data.responseID;
|
||||
var callback = global.cbs[data.responseID];
|
||||
if (callback != undefined) {
|
||||
if (callback) {
|
||||
callback(global.executeResult, data);
|
||||
}
|
||||
};
|
||||
window.executeContract = function(contractID, method, strarg, cb) {
|
||||
window.executeContract = function (contractID, method, strarg, cb) {
|
||||
var sm2Key = global.sm2Key;
|
||||
var request = {};
|
||||
request.action = "executeContract";
|
||||
@ -191,50 +188,51 @@ window.executeContract = function(contractID, method, strarg, cb) {
|
||||
|
||||
global.cbs[request.requestID] = cb;
|
||||
request.contractID = contractID;
|
||||
request.operation=method;
|
||||
request.operation = method;
|
||||
request.arg = strarg;
|
||||
|
||||
if (sm2Key != undefined) {
|
||||
if (sm2Key) {
|
||||
request.pubkey = sm2Key.publicKey;
|
||||
request.signature = sm2.doSignature(request.contractID + "|"
|
||||
+ method + "|" + strarg + "|" + sm2Key.publicKey,
|
||||
sm2Key.privateKey,{hash:true,der:true});
|
||||
sm2Key.privateKey, {hash: true, der: true});
|
||||
}
|
||||
|
||||
global.wssocket.send(JSON.stringify(request));
|
||||
};
|
||||
|
||||
window.executeCurrentContract = function(method, strarg, cb) {
|
||||
window.executeCurrentContract = function (method, strarg, cb) {
|
||||
console.log("executeCurrentContract");
|
||||
var contract = global.currentContract;
|
||||
executeContract(contract.id, method, strarg, cb);
|
||||
};
|
||||
|
||||
|
||||
window.loadBDWareWebSDK = function(url, onopen, handler) {
|
||||
if (window.global == undefined) {
|
||||
window.loadBDWareWebSDK = function (url, onopen, handler) {
|
||||
if (!window.global) {
|
||||
window.global = {};
|
||||
}
|
||||
if (global.sm2Key == undefined) {
|
||||
if (sm2 != undefined)
|
||||
if (!global.sm2Key) {
|
||||
if (sm2)
|
||||
global.sm2Key = sm2.generateKeyPairHex();
|
||||
}
|
||||
if (global.cbs == undefined) {
|
||||
if (!global.cbs) {
|
||||
global.cbs = {};
|
||||
}
|
||||
if (global.wssocket == undefined) {
|
||||
global.wssocket = createWssocket(url, onopen, function(event, wss) {
|
||||
if (!global.wssocket) {
|
||||
global.wssocket = createWssocket(url, onopen, function (event, wss) {
|
||||
var data = event.data;
|
||||
var obj = JSON.parse(data);
|
||||
switch (obj.action) {
|
||||
case 'onExecuteResult':
|
||||
onExecuteResultInternal(obj);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
handler(event, global.wssocket);
|
||||
});
|
||||
} else {
|
||||
if (onopen != undefined)
|
||||
if (onopen)
|
||||
onopen();
|
||||
global.wssocket.addHandler(handler);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user