Compare commits
	
		
			No commits in common. "master" and "v1.4.5" have entirely different histories.
		
	
	
		
	
		
| @ -2,12 +2,14 @@ | |||||||
| <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="./js/createWS.js"></script> | <script src="./js/createWS.js"></script> | ||||||
| <script src="./js/cryptico.js"></script> | <script src="./js/cryptico.js"></script> | ||||||
| <script src="./js/jquery-2.1.4.js"></script> | <script src="./js/jquery-2.1.4.js"></script> | ||||||
| <script src="./js/bootstrap.min.js"></script> | <script src="./js/bootstrap.min.js"></script> | ||||||
| <script src="./js/commonutil.js"></script> | <script src="./js/commonutil.js"></script> | ||||||
|  | 
 | ||||||
| <link href="./css/common.css" rel="stylesheet"> | <link href="./css/common.css" rel="stylesheet"> | ||||||
| <link href="./css/bootstrap.min.css" rel="stylesheet"> | <link href="./css/bootstrap.min.css" rel="stylesheet"> | ||||||
| <script src="./js/vue.js"></script> | <script src="./js/vue.js"></script> | ||||||
| @ -22,7 +24,7 @@ | |||||||
| 				<a class="navbar-brand" href="#"> <img alt="Brand" | 				<a class="navbar-brand" href="#"> <img alt="Brand" | ||||||
| 					src="./img/logo-1.png" style="height: 30px"> | 					src="./img/logo-1.png" style="height: 30px"> | ||||||
| 				</a><a class="navbar-brand">数瑞浏览器   </a> <input id="urlInput" | 				</a><a class="navbar-brand">数瑞浏览器   </a> <input id="urlInput" | ||||||
| 					type="text" class="form-control" placeho=lder="输入地址"  style="display: none;"> | 					type="text" class="form-control" placeholder="输入地址"  style="display: none;"> | ||||||
| 
 | 
 | ||||||
| 				<button class="btn btn-outline-secondary" type="button" | 				<button class="btn btn-outline-secondary" type="button" | ||||||
| 					onclick="connectNode()"  style="display: none;">GO</button> | 					onclick="connectNode()"  style="display: none;">GO</button> | ||||||
|  | |||||||
| @ -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="./js/createWS.js"></script> |     <script src="./js/createWS.js"></script> | ||||||
|     <script src="./js/cryptico.js"></script> |     <script src="./js/cryptico.js"></script> | ||||||
|     <script src="./js/jquery-2.1.4.js"></script> |     <script src="./js/jquery-2.1.4.js"></script> | ||||||
|  | |||||||
							
								
								
									
										0
									
								
								img/logo-1.png
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							
							
						
						
									
										0
									
								
								img/logo-1.png
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							| Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB | 
| @ -313,7 +313,6 @@ function displayOutput(obj) { | |||||||
| 
 | 
 | ||||||
| function initWSocket() { | function initWSocket() { | ||||||
|     let host = $("#urlInput")[0].value; |     let host = $("#urlInput")[0].value; | ||||||
|     document.title = `数瑞浏览器(${host})` |  | ||||||
|     if (!host.startsWith("ws")) { |     if (!host.startsWith("ws")) { | ||||||
|         if (location.href.startsWith("https")) { |         if (location.href.startsWith("https")) { | ||||||
|             host = "wss://" + host; |             host = "wss://" + host; | ||||||
| @ -376,7 +375,6 @@ function changeApp() { | |||||||
|         return; |         return; | ||||||
|     } |     } | ||||||
|     console.log(global.currentContract); |     console.log(global.currentContract); | ||||||
|     document.title = `数瑞浏览器(${global.currentContract.name} - ${$("#urlInput")[0].value})` |  | ||||||
|     changeAppInternal(needRender(global.currentContract)); |     changeAppInternal(needRender(global.currentContract)); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| @ -476,21 +474,21 @@ function triggerExecuteCurrentContract() { | |||||||
|     console.log(funNode); |     console.log(funNode); | ||||||
|     const argInput = $("#argInput"); |     const argInput = $("#argInput"); | ||||||
|     var contract = global.currentContract; |     var contract = global.currentContract; | ||||||
|     var gas = $("#gasInput")[0].value / 1; |     var gas = $("#gasInput")[0].value/1; | ||||||
|     executeContractWithGas(contract.id, funNode.functionName, argInput[0].value, gas, |     executeContractWithGas(contract.id, funNode.functionName, argInput[0].value,gas, | ||||||
|         fillResultInternal, executeContractAsDebug.checked); |         fillResultInternal, executeContractAsDebug.checked); | ||||||
|     var iHtml = "/SCIDE/SCManager?action=executeContract&contractID=" |     var iHtml = "/SCIDE/SCManager?action=executeContract&contractID=" | ||||||
|         + global.currentContract.name + "&operation=" |         + global.currentContract.name + "&operation=" | ||||||
|         + funNode.functionName + "&arg=" + argInput[0].value; |         + funNode.functionName + "&arg=" + argInput[0].value; | ||||||
| 
 | 
 | ||||||
|     var toSign = global.currentContract.name + "|" + funNode.functionName + "|" |     var toSign = global.currentContract.name + "|" + funNode.functionName + "|" | ||||||
|         + argInput[0].value; |         + argInput[0].value ; | ||||||
|     if (gas > 0) { |     if (gas>0){ | ||||||
|         toSign += "|" + gas; |       toSign+="|"+gas; | ||||||
|         iHtml += "&gasLimit=" + gas; |       iHtml+="&gasLimit="+gas; | ||||||
|     } |     } | ||||||
|     iHtml += "&pubkey=" + global.sm2Key.publicKey + "&signature="; |     iHtml+= "&pubkey=" + global.sm2Key.publicKey + "&signature="; | ||||||
|     toSign += "|" + global.sm2Key.publicKey; |     toSign+= "|" + global.sm2Key.publicKey; | ||||||
|     const signature = sm2.doSignature(toSign, global.sm2Key.privateKey, {hash: true, der: true}); |     const signature = sm2.doSignature(toSign, global.sm2Key.privateKey, {hash: true, der: true}); | ||||||
|     let urlPre = $("#urlInput")[0].value; |     let urlPre = $("#urlInput")[0].value; | ||||||
|     if (urlPre.startsWith("ws")) { |     if (urlPre.startsWith("ws")) { | ||||||
| @ -530,8 +528,8 @@ function fillResultInternal(result, data) { | |||||||
|     global.responseCollector[data.responseID].push(data); |     global.responseCollector[data.responseID].push(data); | ||||||
|     $("#statusSpan")[0].innerHTML = result.status; |     $("#statusSpan")[0].innerHTML = result.status; | ||||||
|     $("#timeSpan")[0].innerHTML = "调用耗时:" + data.executeTime + "(ms)"; |     $("#timeSpan")[0].innerHTML = "调用耗时:" + data.executeTime + "(ms)"; | ||||||
|     if (data.executionGas != undefined && data.executionGas > 0) |     if (data.executionGas !=undefined && data.executionGas>0) | ||||||
|         $("#timeSpan")[0].innerHTML += "<br> " + data.executionGas + "(gas)"; |      $("#timeSpan")[0].innerHTML+="<br> "+data.executionGas+"(gas)"; | ||||||
|     $("#timeSpan")[0].innerHTML |     $("#timeSpan")[0].innerHTML | ||||||
|     if (result.result instanceof Object) { |     if (result.result instanceof Object) { | ||||||
|         $("#responseArea")[0].value = JSON.stringify(result.result); |         $("#responseArea")[0].value = JSON.stringify(result.result); | ||||||
| @ -826,8 +824,6 @@ function getRequestParameters() { | |||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| function changeRender() { | function changeRender() { | ||||||
|     if (global.urlparam["noRender"] === "true") { |     if (global.urlparam["noRender"] === "true") { | ||||||
|         global.urlparam["noRender"] = undefined; |         global.urlparam["noRender"] = undefined; | ||||||
|  | |||||||
| @ -49,15 +49,9 @@ var initVue = function () { | |||||||
|                         newKey.id = this.sm2KeyList.length; |                         newKey.id = this.sm2KeyList.length; | ||||||
|                         newKey.title = headerVue.shortName; |                         newKey.title = headerVue.shortName; | ||||||
|                         newKey.sm2Key = this.sm2KeyStr; |                         newKey.sm2Key = this.sm2KeyStr; | ||||||
|                         var exist = false; |                         this.sm2KeyList.push(newKey); | ||||||
|                         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)); |                         localStorage.setItem("PrivKeyList", JSON.stringify(this.sm2KeyList)); | ||||||
|  | 
 | ||||||
|                         getSession(); |                         getSession(); | ||||||
|                         listProjects("priv"); |                         listProjects("priv"); | ||||||
|                     } |                     } | ||||||
|  | |||||||
							
								
								
									
										9214
									
								
								js/jquery-2.1.4.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9214
									
								
								js/jquery-2.1.4.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user