diff --git a/src/main/java/VMSConnection/BC_API.java b/src/main/java/VMSConnection/BC_API.java index 84b8f3b..204a35d 100644 --- a/src/main/java/VMSConnection/BC_API.java +++ b/src/main/java/VMSConnection/BC_API.java @@ -1,9 +1,6 @@ package VMSConnection; -import VMSConnection.Model.LoginRequest; -import VMSConnection.Model.LoginWithSignRequest; -import VMSConnection.Model.RegisterRequest; -import VMSConnection.Model.RegisterWithSignRequest; +import VMSConnection.Model.*; import VMSConnection.Security.BC_KeyManager; import VMSConnection.TCPNet.Conn; import VMSConnection.TCPNet.Message.BaseStruct; @@ -73,6 +70,10 @@ public class BC_API { return doRequest(this.ip,this.port,this.sslPort,request,"user","register"); } + public NetworkResponse getVpnServerInfo(VpnServerInfoRequest request){ + return doRequest(this.ip,this.port,this.sslPort,request,"vpn","getVpnServerInfoByUserName"); + } + private NetworkResponse doRequest(String ip, Integer port, Integer sslPort, BaseStruct model, String type, String command){ // 建立连接 diff --git a/src/main/java/VMSConnection/Model/VpnServerInfoRequest.java b/src/main/java/VMSConnection/Model/VpnServerInfoRequest.java new file mode 100644 index 0000000..45a84a9 --- /dev/null +++ b/src/main/java/VMSConnection/Model/VpnServerInfoRequest.java @@ -0,0 +1,20 @@ +package VMSConnection.Model; + +import VMSConnection.TCPNet.Message.BaseStruct; + +/* + * @Author: Wang Feng + * @Description: + * @Version: 1.0.0 + * @Date: 15:55 2021/7/21 + * @Copyright: MIN-Group;国家重大科技基础设施——未来网络北大实验室;深圳市信息论与未来网络重点实验室 + */ +public class VpnServerInfoRequest extends BaseStruct { + public int ID; + public String Name; + + public VpnServerInfoRequest(int ID,String name){ + this.ID=ID; + this.Name=name; + } +} diff --git a/src/test/java/VMSConnection/TestAPI.java b/src/test/java/VMSConnection/TestAPI.java index 501b56d..3d0306c 100644 --- a/src/test/java/VMSConnection/TestAPI.java +++ b/src/test/java/VMSConnection/TestAPI.java @@ -2,6 +2,7 @@ package VMSConnection; import VMSConnection.Model.LoginWithSignRequest; import VMSConnection.Model.RegisterWithSignRequest; +import VMSConnection.Model.VpnServerInfoRequest; import VMSConnection.Security.BC_KeyManager; import VMSConnection.TCPNet.Message.NetworkResponse; import VMSConnection.Utils.Base64Helper; @@ -33,8 +34,9 @@ public class TestAPI { // System.out.println(res); // } public static void main(String[] args){ - String username="/free1eu"; - String email="2555e683463s@163.com"; + String username="/freexshka2"; + String email="25fjsygqnshkhk3s@163.com"; + int userID=1; // 模拟客户端生成自己的公钥私钥 BC_KeyManager bc_keyManager=new BC_KeyManager(); bc_keyManager.GenKeyPair(); @@ -67,7 +69,7 @@ public class TestAPI { // sig=Base64Helper.BlockChain_Base64Encode(sig).getBytes(StandardCharsets.UTF_8); // // 构造注册请求包 13294184003 - RegisterWithSignRequest request=new RegisterWithSignRequest(1,username,"password", + RegisterWithSignRequest request=new RegisterWithSignRequest(userID,username,"password", "15239970973","1234",email,"dev","", pubkey,0,0,"1625142358",sig); try { @@ -108,5 +110,23 @@ public class TestAPI { e.printStackTrace(); } System.out.println(networkResponse2.Code); + + // 构造vpnserver信息请求包 + VpnServerInfoRequest vpnServerInfoRequest=new VpnServerInfoRequest(userID,username); + try { + System.out.println("vpn request: "+vpnServerInfoRequest.toJson()); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + + // 获取vpnserver信息 + NetworkResponse networkResponse3=bc_api.getVpnServerInfo(vpnServerInfoRequest); + try { + System.out.println("获取vpn信息的应答: "+networkResponse3.toJson()); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + System.out.println(networkResponse3.Code); + } }