diff --git a/pom.xml b/pom.xml index 6b83a8e..4a231ae 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,9 @@ org.aohe sane-service - 0.2.5-b + 0.2.6 + + aohe-sane-service 21 @@ -63,6 +65,20 @@ Java-WebSocket 1.5.3 + + com.formdev + flatlaf + 3.4.1 + no-natives + + + + + + + + + sane-service-v${project.version} diff --git a/src/main/java/org/aohe/Main.java b/src/main/java/org/aohe/Main.java index c355b38..c019468 100644 --- a/src/main/java/org/aohe/Main.java +++ b/src/main/java/org/aohe/Main.java @@ -1,13 +1,12 @@ package org.aohe; -import java.io.IOException; - import lombok.extern.slf4j.Slf4j; import org.aohe.core.sane.utils.SaneSessionUtils; import org.aohe.core.swing.MainWindow; import org.aohe.core.utils.CommandUtils; import org.aohe.core.utils.SystemUtils; import org.aohe.core.web.SocketFactory; +import com.formdev.flatlaf.FlatLightLaf; import javax.swing.*; @@ -18,9 +17,9 @@ public class Main { log.info(" 当前系统类型: {}", SystemUtils.getOsName()); try { //设置窗口主题 - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | - UnsupportedLookAndFeelException e) { + //FlatLightLaf.setup(); + UIManager.setLookAndFeel(new FlatLightLaf()); + } catch (UnsupportedLookAndFeelException e) { throw new RuntimeException(e); } //初始化其他资源 diff --git a/src/main/java/org/aohe/core/package-info.java b/src/main/java/org/aohe/core/package-info.java deleted file mode 100644 index 2f2c548..0000000 --- a/src/main/java/org/aohe/core/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.aohe.core; \ No newline at end of file