Commit 3e0fc80b3c7db51c289b4075b6e903b5dff7a3e6

Authored by 林本磊
1 parent 3512cb40
Exists in develop

fix: 配置提出来

src/main/java/com/example/mina/client/base/AbstractClient.java
1 1 package com.example.mina.client.base;
2 2  
3 3 import com.example.mina.client.entity.AbstractClientMessage;
  4 +import com.example.mina.client.property.ClientProperty;
4 5 import com.example.mina.server.base.AbstractHardwareDataBuffer;
5 6 import org.apache.mina.core.future.ConnectFuture;
6 7 import org.apache.mina.core.service.IoConnector;
... ... @@ -17,6 +18,8 @@ import java.net.InetSocketAddress;
17 18 */
18 19 public abstract class AbstractClient {
19 20  
  21 + protected ClientProperty clientProperty;
  22 +
20 23 protected ProtocolCodecFactory protocolCodecFactory;
21 24  
22 25 protected AbstractVirtualBoxClientHandler abstractVirtualBoxClientHandler;
... ...
src/main/java/com/example/mina/client/base/AbstractVirtualBoxClientHandler.java
... ... @@ -34,7 +34,7 @@ public abstract class AbstractVirtualBoxClientHandler extends IoHandlerAdapter {
34 34  
35 35 @Override
36 36 public void messageReceived(IoSession session, Object message) {
37   - handleCommandResponse(clientMessage.getCommands().get(1).getBytes(), (byte[]) message, ((byte[]) message).length);
  37 + //handleCommandResponse(clientMessage.getCommands().get(1).getBytes(), (byte[]) message, ((byte[]) message).length);
38 38 System.out.println("客户端messageReceived被调用!");
39 39 System.out.println("client端接收信息:" + new String((byte[])message, StandardCharsets.UTF_8));
40 40 LogUtils.println("client端接收信息hex:",(byte[])message);
... ...
src/main/java/com/example/mina/client/box/lte3000/Lte3000Client.java
... ... @@ -4,6 +4,7 @@ import com.example.mina.client.base.AbstractClient;
4 4 import com.example.mina.client.entity.AbstractClientMessage;
5 5 import com.example.mina.client.entity.Command;
6 6 import com.example.mina.client.entity.Lte3000Message;
  7 +import com.example.mina.client.property.ClientProperty;
7 8 import com.example.mina.server.entity.Lte3000DataBuffer;
8 9 import com.example.mina.server.util.Lte3000CommandHelper;
9 10  
... ... @@ -13,6 +14,10 @@ import com.example.mina.server.util.Lte3000CommandHelper;
13 14 */
14 15 public class Lte3000Client extends AbstractClient {
15 16  
  17 + public Lte3000Client(ClientProperty clientProperty) {
  18 + this.clientProperty= clientProperty;
  19 + }
  20 +
16 21 @Override
17 22 protected void init(AbstractClientMessage abstractClientMessage) {
18 23 protocolCodecFactory = new Lte3000ByteFactory();
... ... @@ -27,8 +32,8 @@ public class Lte3000Client extends AbstractClient {
27 32 @Override
28 33 protected void initClientMessage() {
29 34 abstractClientMessage = new Lte3000Message();
30   - abstractClientMessage.setHost("localhost");
31   - abstractClientMessage.setPort(9102);
  35 + abstractClientMessage.setHost(clientProperty.getHost());
  36 + abstractClientMessage.setPort(clientProperty.getPort());
32 37 for (int i = 0; i < this.hardwareDataBuffer.getMaxRow(); i++) {
33 38 abstractClientMessage.getCommands().add(new Command("", Lte3000CommandHelper.genCommandGetCross(i + 1)));
34 39 }
... ...
src/main/java/com/example/mina/client/property/ClientProperty.java 0 → 100644
... ... @@ -0,0 +1,16 @@
  1 +package com.example.mina.client.property;
  2 +
  3 +import lombok.Data;
  4 +
  5 +@Data
  6 +public class ClientProperty {
  7 +
  8 + private String id;
  9 +
  10 + private String name;
  11 +
  12 + private String host;
  13 +
  14 + private Integer port;
  15 +
  16 +}
... ...
src/main/java/com/example/mina/client/test/MinaClient.java
1 1 package com.example.mina.client.test;
2 2  
3 3 import com.example.mina.client.box.lte3000.Lte3000Client;
  4 +import com.example.mina.client.property.ClientProperty;
4 5  
5 6 public class MinaClient {
6 7  
... ... @@ -30,7 +31,13 @@ public class MinaClient {
30 31 // cf.getSession().getCloseFuture().awaitUninterruptibly();
31 32 //
32 33 // connector.dispose();
33   - new Lte3000Client().start();
  34 + ClientProperty clientProperty = new ClientProperty();
  35 + clientProperty.setHost("localhost");
  36 + clientProperty.setPort(9102);
  37 +
  38 + Lte3000Client lte3000Client = new Lte3000Client(clientProperty);
  39 +
  40 + lte3000Client.start();
34 41  
35 42  
36 43 }
... ...