diff --git a/README.md b/README.md index 29be5e0..79b2664 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,7 @@ ###### 8.3.1 javafx 实现 - +![](./src/main/resources/static/redame/img_33.png) ###### 8.3.2 html 实现 diff --git a/src/main/java/com/zhangmeng/tools/controller/SSHConnectionController.java b/src/main/java/com/zhangmeng/tools/controller/SSHConnectionController.java index 9e6facf..0cc991a 100644 --- a/src/main/java/com/zhangmeng/tools/controller/SSHConnectionController.java +++ b/src/main/java/com/zhangmeng/tools/controller/SSHConnectionController.java @@ -102,28 +102,15 @@ public class SSHConnectionController { private WebSocketClient webSocketClient; private SSHService sshService; - private SimpleObjectProperty cmd = new SimpleObjectProperty<>(); - private boolean isConnection = false; - /** - * 用于与Javascript引擎通信。 - */ - private JSObject javascriptConnector; - - /** - * 用于从Javascript引擎进行通信。 - */ - private JavaConnector javaConnector = new JavaConnector(); - ; - @FXML public void initialize() { -// username.setText("root"); -// password.setText("root"); -// host.setText("192.168.52.165"); -// port.setText("22"); + username.setText("root"); + password.setText("root"); + host.setText("192.168.52.165"); + port.setText("22"); message_list.addListener((ListChangeListener) c -> { while (c.next()) { @@ -177,7 +164,7 @@ public class SSHConnectionController { // } catch (InterruptedException e) { // e.printStackTrace(); // } - //发送连接信息 +// 发送连接信息 // SSHData ssh_data = create_ssh_data(command.getText(), SSHData.Type.connect); // webSocketClient.send(toString(ssh_data)); @@ -213,7 +200,6 @@ public class SSHConnectionController { @Override public void onOpen(WebSocket webSocket, ClientHandshake clientHandshake) { - add_msg("WebSocketServer:onOpen--------------------------------------------"); sshService.initConnection(webSocket, uuid.getValue()); } @@ -225,7 +211,6 @@ public class SSHConnectionController { @Override public void onMessage(WebSocket webSocket, String s) { - add_msg("WebSocketServer:onMessage---" + s); sshService.recvHandle(s, webSocket, uuid.getValue()); } @@ -241,14 +226,6 @@ public class SSHConnectionController { }; } - public class JavaConnector { - - public void ssh_info() { - SSHData ssh_data = create_ssh_data("", SSHData.Type.connect); - javascriptConnector.call(JSON.toJSONString(ssh_data)); - } - } - public void load_page_client() { WebEngine webEngine = webView.getEngine(); TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("templates", TemplateConfig.ResourceMode.CLASSPATH)); @@ -305,10 +282,7 @@ public class SSHConnectionController { //收到服务端消息时触发 @Override public void onMessage(String message) { - String[] s = message.split(" "); - for (String s1 : s) { - add_msg(s1); - } + add_msg(message); } //和服务端断开连接时触发 @@ -330,14 +304,13 @@ public class SSHConnectionController { } public static void add_msg(String msg) { -// message_list.add(msg); -// message_list.add("------------------------------------------------------------------->"); -// message_list.add(System.lineSeparator()); + message_list.add(msg); + message_list.add(System.lineSeparator()); } public void receive(String msg) { Platform.runLater(() -> { -// this.show_result.setText(msg); + // this.show_result.setText(msg); }); } diff --git a/src/main/resources/fxml/ssh-connection.fxml b/src/main/resources/fxml/ssh-connection.fxml index 860ddd1..13b68ea 100644 --- a/src/main/resources/fxml/ssh-connection.fxml +++ b/src/main/resources/fxml/ssh-connection.fxml @@ -5,6 +5,7 @@ + diff --git a/src/main/resources/static/redame/img_33.png b/src/main/resources/static/redame/img_33.png new file mode 100644 index 0000000..d952920 Binary files /dev/null and b/src/main/resources/static/redame/img_33.png differ