Revert "fix: 配置提出来"

This reverts commit 3e0fc80b3c7db51c289b4075b6e903b5dff7a3e6.

Revert "fix: 配置提出来"
This reverts commit 3e0fc80b3c7db51c289b4075b6e903b5dff7a3e6.
林本磊
1 parent 3e0fc80b
Showing 5 changed files with 4 additions and 35 deletions Show diff stats
src/main/java/com/example/mina/client/base/AbstractClient.java
src/main/java/com/example/mina/client/base/AbstractVirtualBoxClientHandler.java
src/main/java/com/example/mina/client/box/lte3000/Lte3000Client.java
src/main/java/com/example/mina/client/property/ClientProperty.java
src/main/java/com/example/mina/client/test/MinaClient.java
 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;
@@ -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);
@@ -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)));
         }
@@ -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;
-
-}
 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();
     }
	@@ -34,7 +34,7 @@ public abstract class AbstractVirtualBoxClientHandler extends IoHandlerAdapter {		@@ -34,7 +34,7 @@ public abstract class AbstractVirtualBoxClientHandler extends IoHandlerAdapter {
34		34
35	@Override	35	@Override
36	public void messageReceived(IoSession session, Object message) {	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	System.out.println("客户端messageReceived被调用！");	38	System.out.println("客户端messageReceived被调用！");
39	System.out.println("client端接收信息：" + new String((byte[])message, StandardCharsets.UTF_8));	39	System.out.println("client端接收信息：" + new String((byte[])message, StandardCharsets.UTF_8));
40	LogUtils.println("client端接收信息hex：",(byte[])message);	40	LogUtils.println("client端接收信息hex：",(byte[])message);
	@@ -1,16 +0,0 @@	@@ -1,16 +0,0 @@
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	-}