diff --git a/pom.xml b/pom.xml index b693a1c..f035cab 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.aohe sane-service - 0.3.3 + 0.3.4 aohe-sane-service @@ -63,7 +63,7 @@ org.java-websocket Java-WebSocket - 1.5.3 + 1.5.6 com.formdev @@ -154,7 +154,7 @@ 奥诃影像扫描控件 奥诃公司为影像 WEB 应用开发的 USB 扫描仪连接驱动,请搭配 WEB 产品使用。 - true + true true true diff --git a/src/main/java/org/aohe/core/swing/NewWindow.java b/src/main/java/org/aohe/core/swing/NewWindow.java index a5a34f4..04c92d4 100644 --- a/src/main/java/org/aohe/core/swing/NewWindow.java +++ b/src/main/java/org/aohe/core/swing/NewWindow.java @@ -66,6 +66,12 @@ public class NewWindow extends JFrame { getLogTextArea().append(view + "\n"); } + public static void setStaticView(String view){ + if(logTextArea != null){ + logTextArea.append(view + "\n"); + } + } + public void initSocket() { if(SocketFactory.start()){ setView("socket 服务启动成功"); diff --git a/src/main/java/org/aohe/core/web/SocketFactory.java b/src/main/java/org/aohe/core/web/SocketFactory.java index 9dad715..c5693c2 100644 --- a/src/main/java/org/aohe/core/web/SocketFactory.java +++ b/src/main/java/org/aohe/core/web/SocketFactory.java @@ -3,7 +3,6 @@ package org.aohe.core.web; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import java.net.BindException; import java.net.UnknownHostException; /** @@ -12,12 +11,6 @@ import java.net.UnknownHostException; @Slf4j public class SocketFactory { - /** - * -- GETTER -- - * get 方法 - * - * @return - */ @Getter private static SocketServer socketServer; @@ -45,6 +38,7 @@ public class SocketFactory { } catch (Exception e){ return false; } + log.info("socket ReuseAddr status {}", socketServer.isReuseAddr()); log.info("socket 已启动"); return true; } diff --git a/src/main/java/org/aohe/core/web/SocketServer.java b/src/main/java/org/aohe/core/web/SocketServer.java index cc4fbfe..2ded946 100644 --- a/src/main/java/org/aohe/core/web/SocketServer.java +++ b/src/main/java/org/aohe/core/web/SocketServer.java @@ -8,6 +8,7 @@ import org.aohe.core.result.R; import org.aohe.core.sane.SaneOperational; import org.aohe.core.sane.utils.SaneSessionUtils; +import org.aohe.core.swing.NewWindow; import org.aohe.core.utils.SystemUtils; import org.java_websocket.WebSocket; import org.java_websocket.handshake.ClientHandshake; @@ -65,6 +66,14 @@ public class SocketServer extends WebSocketServer { // websocket log.error( "System error ", ex ); } + if(ex instanceof java.net.BindException){ + //无法绑定接口 + NewWindow.setStaticView("端口绑定失败,请检查端口占用,程序退出中..."); + new Thread( ()->{ + NewWindow.sleep(3000); + System.exit(0); + }).start(); + } } diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 28d430a..b3dc4f6 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - +