林本磊 / virtualbox

Download as
Browse Code »

Commit 2359b0ae24cff075878744b703fc9a561bb33ba2

Authored by 林本磊
1 parent 3e0fc80b
Exists in develop

Revert "fix: 配置提出来" 

This reverts commit 3e0fc80b3c7db51c289b4075b6e903b5dff7a3e6.
Showing 5 changed files with 4 additions and 35 deletions   Show diff stats
src/main/java/com/example/mina/client/base/AbstractClient.java
  Diff comments   View file @2359b0a
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;
5 4 import com.example.mina.server.base.AbstractHardwareDataBuffer;
6 5 import org.apache.mina.core.future.ConnectFuture;
7 6 import org.apache.mina.core.service.IoConnector;
... ... @@ -18,8 +17,6 @@ import java.net.InetSocketAddress;
18 17 */
19 18 public abstract class AbstractClient {
20 19  
21   - protected ClientProperty clientProperty;
22   -
23 20 protected ProtocolCodecFactory protocolCodecFactory;
24 21  
25 22 protected AbstractVirtualBoxClientHandler abstractVirtualBoxClientHandler;
... ...
src/main/java/com/example/mina/client/base/AbstractVirtualBoxClientHandler.java
  Diff comments   View file @2359b0a
... ... @@ -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
  Diff comments   View file @2359b0a
... ... @@ -4,7 +4,6 @@ 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;
8 7 import com.example.mina.server.entity.Lte3000DataBuffer;
9 8 import com.example.mina.server.util.Lte3000CommandHelper;
10 9  
... ... @@ -14,10 +13,6 @@ import com.example.mina.server.util.Lte3000CommandHelper;
14 13 */
15 14 public class Lte3000Client extends AbstractClient {
16 15  
17   - public Lte3000Client(ClientProperty clientProperty) {
18   - this.clientProperty= clientProperty;
19   - }
20   -
21 16 @Override
22 17 protected void init(AbstractClientMessage abstractClientMessage) {
23 18 protocolCodecFactory = new Lte3000ByteFactory();
... ... @@ -32,8 +27,8 @@ public class Lte3000Client extends AbstractClient {
32 27 @Override
33 28 protected void initClientMessage() {
34 29 abstractClientMessage = new Lte3000Message();
35   - abstractClientMessage.setHost(clientProperty.getHost());
36   - abstractClientMessage.setPort(clientProperty.getPort());
  30 + abstractClientMessage.setHost("localhost");
  31 + abstractClientMessage.setPort(9102);
37 32 for (int i = 0; i < this.hardwareDataBuffer.getMaxRow(); i++) {
38 33 abstractClientMessage.getCommands().add(new Command("", Lte3000CommandHelper.genCommandGetCross(i + 1)));
39 34 }
... ...
src/main/java/com/example/mina/client/property/ClientProperty.java
View file @3e0fc80
... ... @@ -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   -}
src/main/java/com/example/mina/client/test/MinaClient.java
  Diff comments   View file @2359b0a
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;
5 4  
6 5 public class MinaClient {
7 6  
... ... @@ -31,13 +30,7 @@ public class MinaClient {
31 30 // cf.getSession().getCloseFuture().awaitUninterruptibly();
32 31 //
33 32 // connector.dispose();
34   - ClientProperty clientProperty = new ClientProperty();
35   - clientProperty.setHost("localhost");
36   - clientProperty.setPort(9102);
37   -
38   - Lte3000Client lte3000Client = new Lte3000Client(clientProperty);
39   -
40   - lte3000Client.start();
  33 + new Lte3000Client().start();
41 34  
42 35  
43 36 }
... ...