wefree/minbrowser
1
0 Fork 0
mirror of https://gitee.com/willfree/minbrowser.git synced 2026-10-05 01:15:42 +08:00
Code Issues Projects Releases Wiki Activity

与MIS通信的注册和登录上增加了时间戳；据此导出了v1.1版本的安装包

Browse Source
This commit is contained in:
free will committed 2020-12-10 09:11:46 +08:00
1 parent a7c2b0bce3
commit 321c47d8b6
5 files changed
+55 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

min/settings.properties
+5 -5
View File
@@ -1,9 +1,9 @@
#\u4FEE\u6539\u914D\u7F6E\u6587\u4EF6
#Thu Dec 03 09:37:21 CST 2020
ServerIPAddress=10.113.34.66
MIS_PORT=6363
#Tue Dec 08 20:37:13 CST 2020
ServerIPAddress=121.15.171.92
MIS_PORT=13899
DataPackagePrefix=/MIN/Nginx/test2
ThreadNumberForFileTransfer=5
ServerPortAddress=6363
MIS_IP=121.15.171.92
ServerPortAddress=13899
MIS_IP=121.15.171.91
DownloadFileDirectory=.\\filecache\\
src/main/java/cn/minbrowser/protocol/MinURL/MinURLConnection.java
+40 -40
View File
@@ -68,37 +68,37 @@ public class MinURLConnection extends URLConnection {
return null;
}
// @Override
// public String getContentType() {
// // mime
// String mime;
// // 根据min url赋值mime
// String minPrefix= getMINProtocolPrefix();
// if(minPrefix==null){
// mime=PrefixTypeUtil.PrefixType.OCT.toString();
// }else{
// mime=PrefixTypeUtil.recognizePrefixType(minPrefix).toString();
// }
// System.out.println("MIME: " + mime);
// return mime; // TODO: switch based on file-type
// }
@Override
public String getContentType() {
System.out.println("getContentType");
// 等待获取MIME
while(!isAlreadyGetMime){
try {
Thread.sleep(2);
} catch (InterruptedException e) {
e.printStackTrace();
}
// mime
String mime;
// 根据min url赋值mime
String minPrefix= getMINProtocolPrefix();
if(minPrefix==null){
mime=PrefixTypeUtil.PrefixType.OCT.toString();
}else{
mime=PrefixTypeUtil.recognizePrefixType(minPrefix).toString();
}
// 获取到MIME
System.out.println("MIME: " + mime);
return mime; // TODO: switch based on file-type
}
// @Override
// public String getContentType() {
// System.out.println("getContentType");
// // 等待获取MIME
// while(!isAlreadyGetMime){
// try {
// Thread.sleep(2);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
// }
// // 获取到MIME
// System.out.println("MIME: " + mime);
// return mime; // TODO: switch based on file-type
// }
@Override
public int getContentLength() {
return data.length;
@@ -129,22 +129,22 @@ public class MinURLConnection extends URLConnection {
}
System.out.println("min prefix: "+minPrefix);
// 交由MinWebRender处理该min标识：从web服务器上面拉取数据
MINHTTP_ResponseDataPacket responseDataPacket = MINHTTP_DataAPI.handleMinHttpPrefix(minPrefix);
this.mime=responseDataPacket.getContent_Type();
this.isAlreadyGetMime=true;
this.data=responseDataPacket.getResponseData();
System.out.println("$$$data: "+new String(data, StandardCharsets.UTF_8));
// MinWebRender.WebRenderResponse webRenderResponse = minWebRender.handleMinPrefix(minPrefix);
// // 根据MinWebRender的返回内容，进行不同的操作
// if(webRenderResponse.isRedirect){
// // 重定向
// data=webRenderResponse.urlData;
// mainApp.getNavigationBarController().getSelectedTab()
// .load(MinUrlUtil.MinUrlHead +webRenderResponse.newMinPrefix.substring(1));
// }else{
// // 直接渲染
// data=webRenderResponse.urlData;
// }
// MINHTTP_ResponseDataPacket responseDataPacket = MINHTTP_DataAPI.handleMinHttpPrefix(minPrefix);
// this.mime=responseDataPacket.getContent_Type();
// this.isAlreadyGetMime=true;
// this.data=responseDataPacket.getResponseData();
// System.out.println("$$$data: "+new String(data, StandardCharsets.UTF_8));
MinWebRender.WebRenderResponse webRenderResponse = minWebRender.handleMinPrefix(minPrefix);
// 根据MinWebRender的返回内容，进行不同的操作
if(webRenderResponse.isRedirect){
// 重定向
data=webRenderResponse.urlData;
mainApp.getNavigationBarController().getSelectedTab()
.load(MinUrlUtil.MinUrlHead +webRenderResponse.newMinPrefix.substring(1));
}else{
// 直接渲染
data=webRenderResponse.urlData;
}
}
// 去掉协议头/获得MIN协议前缀部分
src/main/java/cn/minbrowser/util/MISUtil/NDNBlockChainConnectClient.java
+3
View File
@@ -248,7 +248,10 @@ public class NDNBlockChainConnectClient {
return "";
}
String idInfo = getIdInfo();
System.out.println("get idInfo: "+idInfo);
System.out.println("IP: "+NDNBlockChainIPAddress+", Port: "+NDNBlockChainPortAddress);
Face face = new Face(NDNBlockChainIPAddress, NDNBlockChainPortAddress);
System.out.println("testhhhh");
Interest interest = new Interest();
String uri = "";
boolean identityCheckMode=true;
src/main/java/cn/minbrowser/view/login/LoginHandler.java
+4 -1
View File
@@ -57,6 +57,7 @@ public class LoginHandler {
System.out.println("???"+loginJsonString);
NDNBlockChainConnectClient ndnBlockChainConnectClient =
new NDNBlockChainConnectClient(MinDataAPI.misIpString,MinDataAPI.misPortInteger);
System.out.println(MinDataAPI.misIpString + " " + MinDataAPI.misPortInteger);
String resString = ndnBlockChainConnectClient.loginNewUser(RSACrypto.encrypt2(loginJsonString));
// 解析MIS返回的信息
boolean flag=false;
@@ -95,7 +96,9 @@ public class LoginHandler {
JSONObject jsonObject = new JSONObject();
String commandString = "Login";
String type ="user-act";
String time ="1238237238723287378";
// String time ="1238237238723287378";
Long timeLong=System.currentTimeMillis()/1000;
String time=timeLong.toString();
String userNameString = username;
String passWordString = password;
String prefix ="/"+userNameString;
src/main/java/cn/minbrowser/view/login/RegisterHandler.java
+3 -1
View File
@@ -92,7 +92,9 @@ public class RegisterHandler {
String phonnumber = phoneNumber;
String Password = password;
String prefix ="/"+userNameString;
String time ="4343545656565656565656";
// String time ="4343545656565656565656";
Long timeLong=System.currentTimeMillis()/1000;
String time=timeLong.toString();
String realname ="xxx";
String IDcard= "xxx";
String AbouMe= "xxx";