diff --git a/docs/开发说明.md b/docs/开发说明.md new file mode 100644 index 0000000..3fe97c1 --- /dev/null +++ b/docs/开发说明.md @@ -0,0 +1,4 @@ +## 关于VMSConnection与MISConnection的说明 +VMSConnection支持与VMS（VPN Management Server）的加密TCP通信， +MISConnection支持与MIS（MIN Server）的加密TCP通信。 +在当前版本中，两者与后台的通信握手流程是一致的，故后者只基于前者实现相应的通信接口即可。 \ No newline at end of file diff --git a/src/main/java/MISConnection/MIS_API.java b/src/main/java/MISConnection/MIS_API.java new file mode 100644 index 0000000..228a9b0 --- /dev/null +++ b/src/main/java/MISConnection/MIS_API.java @@ -0,0 +1,14 @@ +package MISConnection; + +import VMSConnection.BC_API; + +/* + * @Author: Wang Feng + * @Description: + * @Version: 1.0.0 + * @Date: 15:52 2021/8/24 + * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室 + */ +public class MIS_API extends BC_API { + +} diff --git a/src/main/java/MISConnection/Model/AuthenticationRequest.java b/src/main/java/MISConnection/Model/AuthenticationRequest.java new file mode 100644 index 0000000..d40a2f4 --- /dev/null +++ b/src/main/java/MISConnection/Model/AuthenticationRequest.java @@ -0,0 +1,20 @@ +package MISConnection.Model; + +import VMSConnection.TCPNet.Message.BaseStruct; + +/* + * @Author: Wang Feng + * @Description: + * @Version: 1.0.0 + * @Date: 15:55 2021/8/24 + * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室 + */ +public class AuthenticationRequest extends BaseStruct { + public String IdentityIdentifier; + public String Phone; + + public AuthenticationRequest(String identityIdentifier, String phone) { + IdentityIdentifier = identityIdentifier; + Phone = phone; + } +} diff --git a/src/main/java/MISConnection/Model/GetValidIdentityRequest.java b/src/main/java/MISConnection/Model/GetValidIdentityRequest.java new file mode 100644 index 0000000..7a1f9d0 --- /dev/null +++ b/src/main/java/MISConnection/Model/GetValidIdentityRequest.java @@ -0,0 +1,25 @@ +package MISConnection.Model; + +import VMSConnection.TCPNet.Message.BaseStruct; + +/* + * @Author: Wang Feng + * @Description: + * @Version: 1.0.0 + * @Date: 16:07 2021/8/24 + * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室 + */ +public class GetValidIdentityRequest extends BaseStruct { + public String IdentityIdentifier; + public String Passwd; + public String Phone; + public String VerificationCode; + + public GetValidIdentityRequest(String identityIdentifier, + String passwd, String phone, String verificationCode) { + IdentityIdentifier = identityIdentifier; + Passwd = passwd; + Phone = phone; + VerificationCode = verificationCode; + } +} diff --git a/src/main/java/MISConnection/Model/RegisterRequest.java b/src/main/java/MISConnection/Model/RegisterRequest.java new file mode 100644 index 0000000..030d6fb --- /dev/null +++ b/src/main/java/MISConnection/Model/RegisterRequest.java @@ -0,0 +1,30 @@ +package MISConnection.Model; + +import VMSConnection.TCPNet.Message.BaseStruct; + +/* + * @Author: Wang Feng + * @Description: + * @Version: 1.0.0 + * @Date: 16:02 2021/8/24 + * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室 + */ +public class RegisterRequest extends BaseStruct { + public String IdentityIdentifier; + public String Pubkey; + public String Passwd; + public String PrikeyEncrypted; + public String Phone; + public String VerificationCode; + + public RegisterRequest(String identityIdentifier, + String pubkey, String passwd, + String prikeyEncrypted, String phone, String verificationCode) { + IdentityIdentifier = identityIdentifier; + Pubkey = pubkey; + Passwd = passwd; + PrikeyEncrypted = prikeyEncrypted; + Phone = phone; + VerificationCode = verificationCode; + } +} diff --git a/src/main/java/MISConnection/Model/ResetPasswordRequest.java b/src/main/java/MISConnection/Model/ResetPasswordRequest.java new file mode 100644 index 0000000..9aed1c8 --- /dev/null +++ b/src/main/java/MISConnection/Model/ResetPasswordRequest.java @@ -0,0 +1,30 @@ +package MISConnection.Model; + +import VMSConnection.TCPNet.Message.BaseStruct; + +/* + * @Author: Wang Feng + * @Description: + * @Version: 1.0.0 + * @Date: 16:11 2021/8/24 + * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室 + */ +public class ResetPasswordRequest extends BaseStruct { + public String IdentityIdentifier; + public String PrePasswd; + public String Passwd; + public String PrikeyEncrypted; + public String Phone; + public String VerificationCode; + + public ResetPasswordRequest(String identityIdentifier, + String prePasswd, String passwd, + String prikeyEncrypted, String phone, String verificationCode) { + IdentityIdentifier = identityIdentifier; + PrePasswd = prePasswd; + Passwd = passwd; + PrikeyEncrypted = prikeyEncrypted; + Phone = phone; + VerificationCode = verificationCode; + } +} diff --git a/src/main/java/MISConnection/Model/UploadEncryptedPrikeyRequest.java b/src/main/java/MISConnection/Model/UploadEncryptedPrikeyRequest.java new file mode 100644 index 0000000..93d4f35 --- /dev/null +++ b/src/main/java/MISConnection/Model/UploadEncryptedPrikeyRequest.java @@ -0,0 +1,28 @@ +package MISConnection.Model; + +import VMSConnection.TCPNet.Message.BaseStruct; + +/* + * @Author: Wang Feng + * @Description: + * @Version: 1.0.0 + * @Date: 16:13 2021/8/24 + * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室 + */ +public class UploadEncryptedPrikeyRequest extends BaseStruct { + public String IdentityIdentifier; + public String Passwd; + public String PrikeyEncrypted; + public String Phone; + public String VerificationCode; + + public UploadEncryptedPrikeyRequest(String identityIdentifier, + String passwd, String prikeyEncrypted, + String phone, String verificationCode) { + IdentityIdentifier = identityIdentifier; + Passwd = passwd; + PrikeyEncrypted = prikeyEncrypted; + Phone = phone; + VerificationCode = verificationCode; + } +} diff --git a/src/main/java/examples/VPNLoginExample.java b/src/main/java/examples/VPNLoginExample.java index 331147f..f818955 100644 --- a/src/main/java/examples/VPNLoginExample.java +++ b/src/main/java/examples/VPNLoginExample.java @@ -31,7 +31,7 @@ public class VPNLoginExample { // 身份信息保存位置 public static String identityPath="D:\\TEST\\Identitys\\"; // 用户名 - public static String username="frwiwawuwh1"; + public static String username="fsusuwh1"; // VMS发送来的证书的密码 public static byte[] certPasswd="123456".getBytes(StandardCharsets.UTF_8); // 基于用户名的用户身份标识 @@ -39,7 +39,7 @@ public class VPNLoginExample { // 注册用户的IP public static String vms_ip="121.15.171.91"; // 注册邮箱 - public static String email="25wgjyggys111@163.com"; + public static String email="25ashsauys111@163.com"; /** * 生成本地密钥，持久化存储到本地硬盘 @@ -235,8 +235,8 @@ public class VPNLoginExample { // 测试注册登录 public static void main(String[] args){ // new VPNLoginExample().testRegister(); -//// new VPNLoginExample().testLogin(); - VpnServerInfoListExample infoList = new VPNLoginExample().testGetVPNInfo(); - System.out.println(infoList); + new VPNLoginExample().testLogin(); +// VpnServerInfoListExample infoList = new VPNLoginExample().testGetVPNInfo(); +// System.out.println(infoList); } }