diff --git a/src/main/java/com/example/mina/client/base/AbstractClient.java b/src/main/java/com/example/mina/client/base/AbstractClient.java index ced2462..3095b50 100644 --- a/src/main/java/com/example/mina/client/base/AbstractClient.java +++ b/src/main/java/com/example/mina/client/base/AbstractClient.java @@ -1,6 +1,7 @@ package com.example.mina.client.base; import com.example.mina.client.entity.AbstractClientMessage; +import com.example.mina.client.property.ClientProperty; import com.example.mina.server.base.AbstractHardwareDataBuffer; import org.apache.mina.core.future.ConnectFuture; import org.apache.mina.core.service.IoConnector; @@ -17,6 +18,8 @@ import java.net.InetSocketAddress; */ public abstract class AbstractClient { + protected ClientProperty clientProperty; + protected ProtocolCodecFactory protocolCodecFactory; protected AbstractVirtualBoxClientHandler abstractVirtualBoxClientHandler; diff --git a/src/main/java/com/example/mina/client/base/AbstractVirtualBoxClientHandler.java b/src/main/java/com/example/mina/client/base/AbstractVirtualBoxClientHandler.java index 313c9d3..15da719 100644 --- a/src/main/java/com/example/mina/client/base/AbstractVirtualBoxClientHandler.java +++ b/src/main/java/com/example/mina/client/base/AbstractVirtualBoxClientHandler.java @@ -34,7 +34,7 @@ public abstract class AbstractVirtualBoxClientHandler extends IoHandlerAdapter { @Override public void messageReceived(IoSession session, Object message) { - handleCommandResponse(clientMessage.getCommands().get(1).getBytes(), (byte[]) message, ((byte[]) message).length); + //handleCommandResponse(clientMessage.getCommands().get(1).getBytes(), (byte[]) message, ((byte[]) message).length); System.out.println("客户端messageReceived被调用!"); System.out.println("client端接收信息:" + new String((byte[])message, StandardCharsets.UTF_8)); LogUtils.println("client端接收信息hex:",(byte[])message); diff --git a/src/main/java/com/example/mina/client/box/lte3000/Lte3000Client.java b/src/main/java/com/example/mina/client/box/lte3000/Lte3000Client.java index dca3d02..fbe1652 100644 --- a/src/main/java/com/example/mina/client/box/lte3000/Lte3000Client.java +++ b/src/main/java/com/example/mina/client/box/lte3000/Lte3000Client.java @@ -4,6 +4,7 @@ import com.example.mina.client.base.AbstractClient; import com.example.mina.client.entity.AbstractClientMessage; import com.example.mina.client.entity.Command; import com.example.mina.client.entity.Lte3000Message; +import com.example.mina.client.property.ClientProperty; import com.example.mina.server.entity.Lte3000DataBuffer; import com.example.mina.server.util.Lte3000CommandHelper; @@ -13,6 +14,10 @@ import com.example.mina.server.util.Lte3000CommandHelper; */ public class Lte3000Client extends AbstractClient { + public Lte3000Client(ClientProperty clientProperty) { + this.clientProperty= clientProperty; + } + @Override protected void init(AbstractClientMessage abstractClientMessage) { protocolCodecFactory = new Lte3000ByteFactory(); @@ -27,8 +32,8 @@ public class Lte3000Client extends AbstractClient { @Override protected void initClientMessage() { abstractClientMessage = new Lte3000Message(); - abstractClientMessage.setHost("localhost"); - abstractClientMessage.setPort(9102); + abstractClientMessage.setHost(clientProperty.getHost()); + abstractClientMessage.setPort(clientProperty.getPort()); for (int i = 0; i < this.hardwareDataBuffer.getMaxRow(); i++) { abstractClientMessage.getCommands().add(new Command("", Lte3000CommandHelper.genCommandGetCross(i + 1))); } diff --git a/src/main/java/com/example/mina/client/property/ClientProperty.java b/src/main/java/com/example/mina/client/property/ClientProperty.java new file mode 100644 index 0000000..10d8fa9 --- /dev/null +++ b/src/main/java/com/example/mina/client/property/ClientProperty.java @@ -0,0 +1,16 @@ +package com.example.mina.client.property; + +import lombok.Data; + +@Data +public class ClientProperty { + + private String id; + + private String name; + + private String host; + + private Integer port; + +} diff --git a/src/main/java/com/example/mina/client/test/MinaClient.java b/src/main/java/com/example/mina/client/test/MinaClient.java index 815e10a..849c9d3 100644 --- a/src/main/java/com/example/mina/client/test/MinaClient.java +++ b/src/main/java/com/example/mina/client/test/MinaClient.java @@ -1,6 +1,7 @@ package com.example.mina.client.test; import com.example.mina.client.box.lte3000.Lte3000Client; +import com.example.mina.client.property.ClientProperty; public class MinaClient { @@ -30,7 +31,13 @@ public class MinaClient { // cf.getSession().getCloseFuture().awaitUninterruptibly(); // // connector.dispose(); - new Lte3000Client().start(); + ClientProperty clientProperty = new ClientProperty(); + clientProperty.setHost("localhost"); + clientProperty.setPort(9102); + + Lte3000Client lte3000Client = new Lte3000Client(clientProperty); + + lte3000Client.start(); } -- libgit2 0.21.2