Browse Source

[FIX] some issues

Gogs 7 years ago
parent
commit
87742708e0

+ 1 - 2
src/main/java/org/robert/printer/ws/PrintersSocketHandler.java

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.UUID;
 
 import javax.print.PrintException;
+import javax.swing.JOptionPane;
 
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
@@ -67,8 +68,6 @@ public class PrintersSocketHandler {
 
 	@OnWebSocketMessage
 	public void onMessage(Session session, String message) throws IOException {
-		System.out.println("------>" + message);
-
 		if (message == null || message.isEmpty()) {
 			return;
 		}

+ 1 - 4
src/main/java/org/robert/printer/ws/PrintersSocketServer.java

@@ -66,16 +66,13 @@ public class PrintersSocketServer {
 	public void goUp() throws Exception {
 		this.server = new Server(this.getPort());
 
-		HttpConnectionFactory httpConnection = new HttpConnectionFactory(new HttpConfiguration());
-
-
 		SslContextFactory sslContext = new SslContextFactory();
-
 		sslContext.setKeyStorePath(this.getClass().getResource("/resources/printers-tray.jks").toExternalForm());
 		sslContext.setKeyStorePassword("robert2206b");
 		sslContext.setKeyManagerPassword("robert2206a");
 
 		SslConnectionFactory sslConnection = new SslConnectionFactory(sslContext, HttpVersion.HTTP_1_1.asString());
+		HttpConnectionFactory httpConnection = new HttpConnectionFactory(new HttpConfiguration());
 
 		ServerConnector connector = new ServerConnector(this.server, sslConnection, httpConnection);
 		connector.setHost(this.getHost());

+ 15 - 0
src/main/java/org/robert/printer/ws/SocketConnection.java

@@ -10,4 +10,19 @@ public class SocketConnection {
 		this.certificate = certificate;
 	}
 
+	/**
+	 *
+	 * @return
+	 */
+	public Certificate getCertificate() {
+		return certificate;
+	}
+
+	/**
+	 *
+	 * @param certificate
+	 */
+	public void setCertificate(Certificate certificate) {
+		this.certificate = certificate;
+	}
 }