From 2359b0ae24cff075878744b703fc9a561bb33ba2 Mon Sep 17 00:00:00 2001
From: linbenlei <572833793@qq.com>
Date: Fri, 12 Mar 2021 14:34:04 +0800
Subject: [PATCH] Revert "fix: 配置提出来"

---
 src/main/java/com/example/mina/client/base/AbstractClient.java                  |  3 ---
 src/main/java/com/example/mina/client/base/AbstractVirtualBoxClientHandler.java |  2 +-
 src/main/java/com/example/mina/client/box/lte3000/Lte3000Client.java            |  9 ++-------
 src/main/java/com/example/mina/client/property/ClientProperty.java              | 16 ----------------
 src/main/java/com/example/mina/client/test/MinaClient.java                      |  9 +--------
 5 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 src/main/java/com/example/mina/client/property/ClientProperty.java

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 3095b50..ced2462 100644
--- a/src/main/java/com/example/mina/client/base/AbstractClient.java
+++ b/src/main/java/com/example/mina/client/base/AbstractClient.java
@@ -1,7 +1,6 @@
 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;
@@ -18,8 +17,6 @@ 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 15da719..313c9d3 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 fbe1652..dca3d02 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,7 +4,6 @@ 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;
 
@@ -14,10 +13,6 @@ 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();
@@ -32,8 +27,8 @@ public class Lte3000Client extends AbstractClient {
     @Override
     protected void initClientMessage() {
         abstractClientMessage = new Lte3000Message();
-        abstractClientMessage.setHost(clientProperty.getHost());
-        abstractClientMessage.setPort(clientProperty.getPort());
+        abstractClientMessage.setHost("localhost");
+        abstractClientMessage.setPort(9102);
         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
deleted file mode 100644
index 10d8fa9..0000000
--- a/src/main/java/com/example/mina/client/property/ClientProperty.java
+++ /dev/null
@@ -1,16 +0,0 @@
-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 849c9d3..815e10a 100644
--- a/src/main/java/com/example/mina/client/test/MinaClient.java
+++ b/src/main/java/com/example/mina/client/test/MinaClient.java
@@ -1,7 +1,6 @@
 package com.example.mina.client.test;
 
 import com.example.mina.client.box.lte3000.Lte3000Client;
-import com.example.mina.client.property.ClientProperty;
 
 public class MinaClient {
 
@@ -31,13 +30,7 @@ public class MinaClient {
 //        cf.getSession().getCloseFuture().awaitUninterruptibly();
 //
 //        connector.dispose();
-        ClientProperty clientProperty = new ClientProperty();
-        clientProperty.setHost("localhost");
-        clientProperty.setPort(9102);
-
-        Lte3000Client lte3000Client = new Lte3000Client(clientProperty);
-
-        lte3000Client.start();
+        new Lte3000Client().start();
 
 
     }
--
libgit2 0.21.2