From f6a4717dac3e437465aa94daaa0a0cb6ab9b6330 Mon Sep 17 00:00:00 2001 From: jianguo Date: Fri, 31 May 2024 16:08:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=200.3.0=20=E5=A4=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +++- src/main/java/org/aohe/Main.java | 2 ++ src/main/java/org/aohe/core/swing/NewWindow.java | 8 +++++++- src/main/java/org/aohe/core/web/SocketFactory.java | 3 ++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4a231ae..3cfc0f0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.aohe sane-service - 0.2.6 + 0.3.0 aohe-sane-service @@ -145,6 +145,8 @@ true false linux + 奥诃影像扫描控件 + Sane's socket access programme for use with WEB. true true diff --git a/src/main/java/org/aohe/Main.java b/src/main/java/org/aohe/Main.java index 8dcebe7..e20a0a7 100644 --- a/src/main/java/org/aohe/Main.java +++ b/src/main/java/org/aohe/Main.java @@ -47,4 +47,6 @@ public class Main { log.info("socket 服务已关闭 "); })); } + + } \ No newline at end of file diff --git a/src/main/java/org/aohe/core/swing/NewWindow.java b/src/main/java/org/aohe/core/swing/NewWindow.java index 0be6d48..a5a34f4 100644 --- a/src/main/java/org/aohe/core/swing/NewWindow.java +++ b/src/main/java/org/aohe/core/swing/NewWindow.java @@ -72,7 +72,13 @@ public class NewWindow extends JFrame { textField.setForeground(Color.GREEN); textField.setText("服务状态:启动"); }else{ - setView("socket 服务启动失败,请检查8997端口是否被占用"); + setView("socket 服务启动失败"); + setView("请检查8997端口是否被占用,或是否重复打开此程序"); + setView("应用退出中..."); + new Thread( () -> { + sleep(5000); + System.exit(0); + } ).start(); } } diff --git a/src/main/java/org/aohe/core/web/SocketFactory.java b/src/main/java/org/aohe/core/web/SocketFactory.java index 15a1b74..d56e0a8 100644 --- a/src/main/java/org/aohe/core/web/SocketFactory.java +++ b/src/main/java/org/aohe/core/web/SocketFactory.java @@ -3,6 +3,7 @@ package org.aohe.core.web; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import java.net.BindException; import java.net.UnknownHostException; /** @@ -40,7 +41,7 @@ public class SocketFactory { public static boolean start() { try { getSocket().start(); - } catch (UnknownHostException e) { + } catch (Exception e){ return false; } log.info("socket 已启动");